;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
;;;
;;; This file is part of GNU Guix.
;;;
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix git-download)
+ #:use-module (guix build-system cmake)
#:use-module (guix build-system gnu)
#:use-module (guix build-system go)
#:use-module (guix build-system python)
#:use-module (gnu packages networking)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
+ #:use-module (gnu packages python-crypto)
#:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages version-control)
#:use-module (gnu packages virtualization))
-(define %docker-version "18.09.5")
+(define %docker-version "19.03.7")
(define-public python-docker-py
(package
(name "python-docker-py")
- (version "1.10.6")
+ (version "3.7.3")
(source
(origin
(method url-fetch)
- (uri (pypi-uri "docker-py" version))
+ (uri (pypi-uri "docker" version))
(sha256
(base32
- "05f49f6hnl7npmi7kigg0ibqk8s3fhzx1ivvz1kqvlv4ay3paajc"))))
+ "0qmrcvpaz37p85hfddsd4yc8hgqlkzs4cz09q9wmy0pz5pwajqm0"))))
(build-system python-build-system)
;; TODO: Tests require a running Docker daemon.
(arguments '(#:tests? #f))
(inputs
- `(("python-requests" ,python-requests)
+ `(("python-requests" ,python-requests-2.20)
+ ("python-ipaddress" ,python-ipaddress)
("python-six" ,python-six)
+ ("python-urllib3" ,python-urllib3-1.24)
("python-websocket-client" ,python-websocket-client)))
+ (propagated-inputs
+ `(("python-docker-pycreds" ,python-docker-pycreds)
+ ("python-paramiko" ,python-paramiko))) ; adds SSH support
(home-page "https://github.com/docker/docker-py/")
(synopsis "Python client for Docker")
(description "Docker-Py is a Python client for the Docker container
(define-public python-dockerpty
(package
(name "python-dockerpty")
- (version "0.3.4")
+ (version "0.4.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "dockerpty" version))
(sha256
(base32
- "0za6rr349641wv76ww9l3zcic2xyxrirlxpnzl4296h897648455"))))
+ "1kjn64wx23jmr8dcc6g7bwlmrhfmxr77gh6iphqsl39sayfxdab9"))))
(build-system python-build-system)
(native-inputs
`(("python-six" ,python-six)))
(define-public docker-compose
(package
(name "docker-compose")
- (version "1.5.2")
+ (version "1.25.4")
(source
(origin
(method url-fetch)
(uri (pypi-uri "docker-compose" version))
(sha256
(base32
- "0ksg7hm2yvc977968dixxisrhcmvskzpcx3pz0v1kazrdqp7xakr"))))
+ "1ww8ckpj3n5jdg63qvmiqx3gk0fsrnynnnqj17fppymbwjzf5fps"))))
(build-system python-build-system)
;; TODO: Tests require running Docker daemon.
(arguments '(#:tests? #f))
(inputs
- `(("python-docker-py" ,python-docker-py)
+ `(("python-cached-property"
+ ,python-cached-property)
+ ("python-docker-py" ,python-docker-py)
("python-dockerpty" ,python-dockerpty)
("python-docopt" ,python-docopt)
("python-jsonschema" ,python-jsonschema)
("python-pyyaml" ,python-pyyaml)
- ("python-requests" ,python-requests-2.7)
+ ("python-requests" ,python-requests)
("python-six" ,python-six)
("python-texttable" ,python-texttable)
("python-websocket-client" ,python-websocket-client)))
(define-public python-docker-pycreds
(package
(name "python-docker-pycreds")
- (version "0.3.0")
+ (version "0.4.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "docker-pycreds" version))
(sha256
(base32
- "1zxvam1q22qb0jf48553nnncnfrcp88ag4xa0qmq6vr0imn9a3lb"))))
+ "1m44smrggnqghxkqfl7vhapdw89m1p3vdr177r6cq17lr85jgqvc"))))
(build-system python-build-system)
(arguments
`(#:phases
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "0npbzixf3c0jvzm159vygvkydrr8h36c9sq50yv0mdinrys2bvg0"))))
+ (base32 "0npbzixf3c0jvzm159vygvkydrr8h36c9sq50yv0mdinrys2bvg0"))
+ (patches
+ (search-patches "containerd-test-with-go1.13.patch"))))
(build-system go-build-system)
(arguments
`(#:import-path "github.com/containerd/containerd"
(description "This package provides the container daemon for Docker.
It includes image transfer and storage, container execution and supervision,
network attachments.")
- (home-page "http://containerd.io/")
+ (home-page "https://containerd.io/")
(license license:asl2.0)))
;;; Private package that shouldn't be used directly; its purposes is to be
("logrus" ,go-github-com-sirupsen-logrus)
("go-netlink" ,go-netlink)
("go-netns" ,go-netns)
- ("go-golang-org-x-crypto-ssh-terminal"
- ,go-golang-org-x-crypto-ssh-terminal)
- ("go-golang-org-x-sys-unix" ,go-golang-org-x-sys-unix)))
+ ("go-golang-org-x-crypto"
+ ,go-golang-org-x-crypto)
+ ("go-golang-org-x-sys" ,go-golang-org-x-sys)))
(synopsis "Docker user-space proxy")
(description "A proxy running in the user space. It is used by the
built-in registry server of Docker.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "0cirpd9l2qazp2jyanwzvrkx2m98nksjdvn43ff38p89w6133ipb"))
+ (base32 "1sik109lxmiwgrsnvfip1nnal1xkh8z1mlvys6aknjyh29ll1iq8"))
(patches
- (search-patches "docker-engine-test-noinstall.patch"
- "docker-fix-tests.patch"
- "docker-use-fewer-modprobes.patch"))))
+ (search-patches "docker-fix-tests.patch"))))
(build-system gnu-build-system)
(arguments
`(#:modules
(("StockRuntimeName = .*")
(string-append "StockRuntimeName = \""
(assoc-ref inputs "runc")
- "/sbin/runc\"\n")))
+ "/sbin/runc\"\n"))
+ (("DefaultInitBinary = .*")
+ (string-append "DefaultInitBinary = \""
+ (assoc-ref inputs "tini")
+ "/bin/tini\"\n")))
+ (substitute* "daemon/config/config_common_unix_test.go"
+ (("expectedInitPath: \"docker-init\"")
+ (string-append "expectedInitPath: \""
+ (assoc-ref inputs "tini")
+ "/bin/tini\"")))
(substitute* "vendor/github.com/moby/buildkit/executor/runcexecutor/executor.go"
(("var defaultCommandCandidates = .*")
(string-append "var defaultCommandCandidates = []string{\""
"/" relative-path
"\"")) ...)))))
(substitute-LookPath*
+ ("containerd" "containerd" "bin/containerd")
("ps" "procps" "bin/ps")
("mkfs.xfs" "xfsprogs" "bin/mkfs.xfs")
("lvmdiskscan" "lvm2" "sbin/lvmdiskscan")
(delete-file "daemon/graphdriver/btrfs/btrfs_test.go")
(delete-file "daemon/graphdriver/overlay/overlay_test.go")
(delete-file "daemon/graphdriver/overlay2/overlay_test.go")
+ (delete-file "pkg/chrootarchive/archive_unix_test.go")
+ (delete-file "daemon/container_unix_test.go")
+ ;; This file uses cgroups and /proc.
+ (delete-file "pkg/sysinfo/sysinfo_linux_test.go")
+ ;; This file uses cgroups.
+ (delete-file "runconfig/config_test.go")
+ ;; This file uses /var.
+ (delete-file "daemon/oci_linux_test.go")
#t))
(replace 'configure
(lambda _
(setenv "DOCKER_GITCOMMIT" (string-append "v" ,%docker-version))
+ (setenv "VERSION" (string-append ,%docker-version "-ce"))
;; Automatically use bundled dependencies.
;; TODO: Unbundle - see file "vendor.conf".
(setenv "AUTO_GOPATH" "1")
(let* ((out (assoc-ref outputs "out"))
(out-bin (string-append out "/bin")))
(install-file "bundles/dynbinary-daemon/dockerd" out-bin)
- (install-file "bundles/dynbinary-daemon/dockerd-dev" out-bin)
+ (install-file (string-append "bundles/dynbinary-daemon/dockerd-"
+ (getenv "VERSION"))
+ out-bin)
#t))))))
(inputs
`(("btrfs-progs" ,btrfs-progs)
("runc" ,runc)
("util-linux" ,util-linux)
("lvm2" ,lvm2)
+ ("tini" ,tini)
("xfsprogs" ,xfsprogs)
("xz" ,xz)))
(native-inputs
`(("eudev" ,eudev) ; TODO: Should be propagated by lvm2 (.pc -> .pc)
("go" ,go)
+ ("gotestsum" ,gotestsum)
("pkg-config" ,pkg-config)))
(synopsis "Docker container component library, and daemon")
(description "This package provides a framework to assemble specialized
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "0mxxjzkwdny8p2dmyjich7x1gn7hdlfppzjy2skk2k5bwv7nxpmi"))))
+ (base32 "164l33npy8acdbbrz8vcyiwx18vi55wwwikkasg0w43b5bdhz8sx"))))
(build-system go-build-system)
(arguments
`(#:import-path "github.com/docker/cli"
;; information, and the DWARF symbol table.
(setenv "LDFLAGS" "-s -w")
+ ;; Make sure "docker -v" prints a usable version string.
+ (setenv "VERSION" ,%docker-version)
+
;; Make build reproducible.
(setenv "BUILDTIME" "1970-01-01 00:00:01.000000000+00:00")
(symlink "src/github.com/docker/cli/scripts" "./scripts")
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
- (out-bin (string-append out "/bin")))
+ (out-bin (string-append out "/bin"))
+ (etc (string-append out "/etc")))
+ (with-directory-excursion "src/github.com/docker/cli/contrib/completion"
+ (install-file "bash/docker"
+ (string-append etc "/bash_completion.d"))
+ (install-file "fish/docker.fish"
+ (string-append etc "/fish/completions"))
+ (install-file "zsh/_docker"
+ (string-append etc "/zsh/site-functions")))
(chdir "build")
(install-file "docker" out-bin)
#t))))))
(define-public cqfd
(package
(name "cqfd")
- (version "5.0.1")
+ (version "5.1.0")
(source (origin
(method git-fetch)
(uri (git-reference
(file-name (git-file-name name version))
(sha256
(base32
- "1z4v16lbpbwd5ykawizdclpryp2k006lbk2mv427a4b3nvcd9wik"))))
+ "1xhydz01f2rrnw7rmnaxh3f3q1ariq7j2ig0i0w1p3wn10l3q0nv"))))
(build-system gnu-build-system)
(arguments
;; The test suite requires a docker daemon and connectivity.
(home-page "https://github.com/savoirfairelinux/cqfd")
(synopsis "Convenience wrapper for Docker")
(description "cqfd is a Bash script that provides a quick and convenient
-way to run commands in the ecurrent directory, but within a Docker container
+way to run commands in the current directory, but within a Docker container
defined in a per-project configuration file.")
(license license:gpl3+)))
+
+(define-public tini
+ (package
+ (name "tini")
+ (version "0.18.0")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/krallin/tini.git")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn"))))
+ (build-system cmake-build-system)
+ (arguments
+ `(#:tests? #f ;tests require a Docker daemon
+ #:phases (modify-phases %standard-phases
+ (add-after 'unpack 'disable-static-build
+ ;; Disable the static build as it fails to install, with
+ ;; the error: "No valid ELF RPATH or RUNPATH entry exists
+ ;; in the file".
+ (lambda _
+ (substitute* "CMakeLists.txt"
+ ((".*tini-static.*") ""))
+ #t)))))
+ (home-page "https://github.com/krallin/tini")
+ (synopsis "Tiny but valid init for containers")
+ (description "Tini is an init program specifically designed for use with
+containers. It manages a single child process and ensures that any zombie
+processes produced from it are reaped and that signals are properly forwarded.
+Tini is integrated with Docker.")
+ (license license:expat)))
HCoop / jackhill / guix / guix.git / blobdiff