From 01a0b3cea2473819a85aaba49e42a6077125e3fe Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 22 Feb 2018 09:28:59 +0100 Subject: [PATCH] docker: Update version from 17.03.0-ce to 18.02.0-ce [The repository moved from *docker* to *docker-ce*.][1] Update the script to use the current build instructions. [1]: https://github.com/docker/docker-ce/releases --- docker.be0 | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/docker.be0 b/docker.be0 index 4d0f6ecb0..119a2c0f7 100755 --- a/docker.be0 +++ b/docker.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION docker-17.03.0_ce-0 +# BEE_VERSION docker-18.02.0_ce-0 # NOTE: We require a running docker environment. For the first bootstrap # this can be provided by the package docker_binary @@ -12,7 +12,7 @@ ## The source URL(s) define the location of the sources that will be ## downloaded. Version variables may be used to simplify reuse of this bee-file. -SRCURL[0]="https://github.com/docker/docker/archive/v${PKGFULLVERSION//_/-}.tar.gz" +SRCURL[0]="https://github.com/docker/docker-ce/archive/v${PKGFULLVERSION//_/-}.tar.gz" ############################################################################### ## Add URLs/pathes to patch files to the PATCHURL array. @@ -61,8 +61,7 @@ mee_configure() { } mee_build() { - start_cmd make build - start_cmd make DOCKER_GITCOMMIT=v${PKGVERSION}${PKGEXTRAVERSION_DASH} binary + start_cmd make VERSION=${PKGFULLVERSION//_/-} -C components/packaging/static static-linux } mee_install() { @@ -73,18 +72,9 @@ mee_install() { V=${PKGFULLVERSION//_/-} ( - cd $B/bundles/latest/binary-client - - install docker-$V $D$BINDIR/docker - - cd $B/bundles/latest/binary-daemon - - install --target-directory $D$BINDIR docker-containerd - install --target-directory $D$BINDIR docker-containerd-ctr - install --target-directory $D$BINDIR docker-containerd-shim - install docker-proxy $D$BINDIR/docker-proxy - install --target-directory $D$BINDIR docker-runc - install dockerd-$V $D$BINDIR/dockerd + for i in $B/components/packaging/static/build/linux/docker/*; do + start_cmd install --target-directory $D$BINDIR "$i" + done ) cat >$D$SYSCONFDIR/default/docker <<-'__EOF__'