Skip to content

Update Docker from 17.03.0-ce to 18.02.0-ce #659

Merged
merged 1 commit into from
Mar 7, 2018
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 6 additions & 16 deletions docker.be0
Original file line number Diff line number Diff line change
@@ -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