Browse Source

Update docker to 17.09

master
mid-kid 7 years ago
parent
commit
8b1a1b7c60
  1. 30
      satellites/docker.sat

30
satellites/docker.sat

@ -8,24 +8,24 @@
# components/engine/hack/dockerfile/binaries-commits in the docker archive. # components/engine/hack/dockerfile/binaries-commits in the docker archive.
name=docker name=docker
version=17.07.0-ce version=17.09.0-ce
version_runc=2d41c047c83e09a6d61d464906feb2a2f3c52aa4 version_runc=3f2f8b84a77f73d38244dd690525642a72156c64
version_containerd=3addd840653146c90a254301d6c3a663c7fd6429 version_containerd=06b9cb35161009dcb7123345749fef02f7cea8e0
version_tini=949e6facb77383876aeff8a6944dde66b3089574 version_tini=949e6facb77383876aeff8a6944dde66b3089574
version_libnetwork=7b2b1feb1de4817d522cc372af149ff48d25028e version_libnetwork=7b2b1feb1de4817d522cc372af149ff48d25028e
update_url="https://github.com/$name/$name-ce/releases" update_url="https://github.com/$name/$name-ce/releases"
update_names="/archive/v$version.tar.gz" update_names="/archive/v$version.tar.gz"
dlextract "https://github.com/$name/$name-ce/archive/v$version/$name-$version.tar.gz" \ dlextract "https://github.com/$name/$name-ce/archive/v$version/$name-$version.tar.gz" \
'a5d24c4722a2c20109d14c176d577fbf' 'e0df90392b2daa545562342dabf181cf'
dlextract "https://github.com/$name/runc/archive/$version_runc/runc-$version_runc.tar.gz" \ dlextract "https://github.com/opencontainers/runc/archive/$version_runc/runc-$version_runc.tar.gz" \
'4b5a1c761c3cd9513ee0198657a7ac03' '0dc3b1eafba193280d6cf6ffa46c2521'
dlextract "https://github.com/$name/containerd/archive/$version_containerd/containerd-$version_containerd.tar.gz" \ dlextract "https://github.com/containerd/containerd/archive/$version_containerd/containerd-$version_containerd.tar.gz" \
'57648ace245396808739c745f4443f69' '202389709618a6b181216e99718f0132'
dlextract "https://github.com/krallin/tini/archive/$version_tini/tini-$version_tini.tar.gz" \ dlextract "https://github.com/krallin/tini/archive/$version_tini/tini-$version_tini.tar.gz" \
'9873191fc835a79cb94b24377391667e' '9873191fc835a79cb94b24377391667e'
dlextract "https://github.com/$name/libnetwork/archive/$version_libnetwork/libnetwork-$version_libnetwork.tar.gz" \ dlextract "https://github.com/$name/libnetwork/archive/$version_libnetwork/libnetwork-$version_libnetwork.tar.gz" \
'9360e38c43e862e42c128db1852ac5bb' 'a9beb9207b291373dc4e376f04056e8a'
_ _
# Verify that the dependency programs' versions match # Verify that the dependency programs' versions match
@ -71,10 +71,10 @@ export GOPATH="$PWD/.gopath"
# Build cli # Build cli
( cd "$name-ce-$version/components/cli" ( cd "$name-ce-$version/components/cli"
make VERSION="$version" dynbinary DISABLE_WARN_OUTSIDE_CONTAINER=1 make VERSION="$version" GITCOMMIT="$version" dynbinary
mkdir -p man/man1 mkdir -p man/man1
go build -v -o gen-manpages "github.com/$name/cli/man" go build -o gen-manpages "github.com/$name/cli/man"
./gen-manpages --root . --target man/man1 ./gen-manpages --root . --target man/man1
if command -v go-md2man 2> /dev/null; then if command -v go-md2man 2> /dev/null; then
@ -91,11 +91,17 @@ export GOPATH="$PWD/.gopath"
) )
# Build containerd # Build containerd
make -C "containerd-$version_containerd" ( cd "$GOPATH/src/github.com/containerd/containerd"
make BUILDTAGS='seccomp' \
GIT_BRANCH=HEAD \
GIT_COMMIT="$version_containerd"
)
# Build tini # Build tini
( cd "tini-$version_tini" ( cd "tini-$version_tini"
cmake . cmake .
sed -i -e '/^#define TINI_GIT/d' tiniConfig.h
echo "#define TINI_GIT \" - git.$(echo "$version_tini" | cut -c -7)\"" >> tiniConfig.h
make tini-static make tini-static
) )

Loading…
Cancel
Save