diff options
Diffstat (limited to 'gnu/packages/docker.scm')
| -rw-r--r-- | gnu/packages/docker.scm | 43 |
1 files changed, 40 insertions, 3 deletions
diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index a0c90ac5aa..21e20e1842 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr> ;;; Copyright © 2025 Artyom V. Poptsov <poptsov.artyom@gmail.com> ;;; Copyright © 2025 Vinicius Monego <monego@posteo.net> +;;; Copyright © 2025 John Kehayias <john.kehayias@protonmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -103,6 +104,33 @@ management tool.") (license license:asl2.0))) +;; Needed for old v1 of docker-compose; remove once Docker is updated to a +;; more recent version which has the command "docker compose" built-in. +(define-public python-docker-5 + (package + (inherit python-docker) + (name "python-docker") + (version "5.0.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/docker/docker-py") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0m5ifgxdhcf7yci0ncgnxjas879sksrf3im0fahs573g268farz9")))) + (build-system python-build-system) + ;; Integration tests need a running Docker daemon. + (arguments (list #:tests? #f)) + (native-inputs '()) + (inputs (modify-inputs (package-inputs python-docker) + (prepend python-six) + (delete "python-urllib3"))) + (propagated-inputs + (modify-inputs (package-propagated-inputs python-docker) + (prepend python-docker-pycreds python-urllib3-1.26))))) + (define-public python-dockerpty (package (name "python-dockerpty") @@ -139,16 +167,25 @@ client.") "1dq9kfak61xx7chjrzmkvbw9mvj9008k7g8q7mwi4x133p9dk32c")))) (build-system python-build-system) ;; TODO: Tests require running Docker daemon. - (arguments '(#:tests? #f)) + (arguments + (list + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-pyyaml + (lambda _ + (substitute* "setup.py" + ((", < 6") + ""))))))) (inputs (list python-cached-property python-distro - python-docker + python-docker-5 python-dockerpty python-docopt python-dotenv python-jsonschema-3 - python-pyyaml-5 + python-pyyaml python-requests python-six python-texttable |