Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
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
  • Loading branch information
pmenzel committed Mar 6, 2018
1 parent 9370673 commit 01a0b3c
Showing 1 changed file with 6 additions and 16 deletions.
22 changes: 6 additions & 16 deletions 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
Expand All @@ -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.
Expand Down Expand Up @@ -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() {
Expand All @@ -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__'
Expand Down

0 comments on commit 01a0b3c

Please sign in to comment.