Skip to content

Commit

Permalink
Merge pull request #304 from mariux64/update-docker-from-1.12.3-to-17…
Browse files Browse the repository at this point in the history
….03.0-ce

docker: Update version from 1.12.3 to 17.03.0-ce
  • Loading branch information
donald authored Mar 8, 2017
2 parents 09aabe0 + 1e07a96 commit 6d033ce
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions docker.be0
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env beesh

# BEE_VERSION docker-1.12.3-0
# BEE_VERSION docker-17.03.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${PKGVERSION}.tar.gz"
SRCURL[0]="https://github.com/docker/docker/archive/v${PKGFULLVERSION//_/-}.tar.gz"

###############################################################################
## Add URLs/pathes to patch files to the PATCHURL array.
Expand Down Expand Up @@ -62,15 +62,15 @@ mee_configure() {

mee_build() {
start_cmd make build
start_cmd make DOCKER_GITCOMMIT=${PKGVERSION} binary
start_cmd make DOCKER_GITCOMMIT=v${PKGVERSION}${PKGEXTRAVERSION_DASH} binary
}

mee_install() {
install --directory $D$BINDIR
install --directory $D$SYSCONFDIR/default
install --directory $D$SYSCONFDIR/systemd/system

V=$PKGVERSION
V=${PKGFULLVERSION//_/-}

(
cd $B/bundles/latest/binary-client
Expand All @@ -82,7 +82,7 @@ mee_install() {
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-$V $D$BINDIR/docker-proxy
install docker-proxy $D$BINDIR/docker-proxy
install --target-directory $D$BINDIR docker-runc
install dockerd-$V $D$BINDIR/dockerd
)
Expand Down

0 comments on commit 6d033ce

Please sign in to comment.