Merge pull request #457 from andrewhsu/v

[18.03] Bump version to 18.03.0-ce-rc3
Merge pull request #456 from andrewhsu/p
2018-03-08 10:03:02 -08:00 · 2018-03-08 09:58:32 -08:00 · 2018-03-08 09:53:33 -08:00 · 2018-03-08 09:48:32 -08:00 · 2018-03-08 09:41:50 -08:00 · 2018-03-08 09:29:02 -08:00
9 changed files with 23 additions and 12 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-18.03.0-ce-rc2
+18.03.0-ce-rc3
--- a/components/cli/VERSION
+++ b/components/cli/VERSION
@ -1 +1 @@
-18.03.0-ce-rc2
+18.03.0-ce-rc3
--- a/components/engine/hack/dockerfile/install/containerd.installer
+++ b/components/engine/hack/dockerfile/install/containerd.installer
@ -14,10 +14,15 @@ install_containerd() {

 	(

-		if [ "$1" == "static" ]; then
-			export BUILDTAGS='static_build netgo'
-			export EXTRA_FLAGS='-buildmod pie'
-			export EXTRA_LDFLAGS='-extldflags "-fno-PIC -static"'
+		export BUILDTAGS='static_build netgo'
+		export EXTRA_FLAGS='-buildmode=pie'
+		export EXTRA_LDFLAGS='-extldflags "-fno-PIC -static"'
+
+		# Reset build flags to nothing if we want a dynbinary
+		if [ "$1" == "dynamic" ]; then
+			export BUILDTAGS=''
+			export EXTRA_FLAGS=''
+			export EXTRA_LDFLAGS=''
 		fi

 		make
--- a/components/engine/hack/dockerfile/install/proxy.installer
+++ b/components/engine/hack/dockerfile/install/proxy.installer
@ -23,6 +23,7 @@ install_proxy() {

 install_proxy_dynamic() {
 	export PROXY_LDFLAGS="-linkmode=external" install_proxy
+	export BUILD_MODE="-buildmode=pie"
 	_install_proxy
 }

@ -31,7 +32,7 @@ _install_proxy() {
 	git clone https://github.com/docker/libnetwork.git "$GOPATH/src/github.com/docker/libnetwork"
 	cd "$GOPATH/src/github.com/docker/libnetwork"
 	git checkout -q "$LIBNETWORK_COMMIT"
-	go build -buildmode=pie -ldflags="$PROXY_LDFLAGS" -o ${PREFIX}/docker-proxy github.com/docker/libnetwork/cmd/proxy
+	go build $BUILD_MODE -ldflags="$PROXY_LDFLAGS" -o ${PREFIX}/docker-proxy github.com/docker/libnetwork/cmd/proxy
 }


--- a/components/engine/hack/dockerfile/install/runc.installer
+++ b/components/engine/hack/dockerfile/install/runc.installer
@ -11,7 +11,12 @@ install_runc() {
 	git clone https://github.com/opencontainers/runc.git "$GOPATH/src/github.com/opencontainers/runc"
 	cd "$GOPATH/src/github.com/opencontainers/runc"
 	git checkout -q "$RUNC_COMMIT"
-	make BUILDTAGS="$RUNC_BUILDTAGS" $1
+	if [ -z "$1" ]; then
+		target=static
+	else
+		target="$1"
+	fi
+	make BUILDTAGS="$RUNC_BUILDTAGS" "$target"
 	mkdir -p ${PREFIX}
 	cp runc ${PREFIX}/docker-runc
 }
--- a/components/packaging/deb/build-deb
+++ b/components/packaging/deb/build-deb
@ -11,7 +11,7 @@ fi
    set -e
    cd engine
    # I want to rip this install-binaries script out so badly
-    for component in tini proxy runc containerd;do
+    for component in tini "proxy dynamic" "runc all" "containerd dynamic";do
        TMP_GOPATH="/go" hack/dockerfile/install/install.sh $component
    done
 )
--- a/components/packaging/rpm/centos-7/docker-ce.spec
+++ b/components/packaging/rpm/centos-7/docker-ce.spec
@ -67,7 +67,7 @@ pushd /go/src/github.com/docker/cli
 make VERSION=%{_origversion} GITCOMMIT=%{_gitcommit} dynbinary manpages # cli
 popd
 pushd engine
-for component in tini proxy runc containerd;do
+for component in tini "proxy dynamic" "runc all" "containerd dynamic";do
    TMP_GOPATH="/go" hack/dockerfile/install/install.sh $component
 done
 VERSION=%{_origversion} hack/make.sh dynbinary
--- a/components/packaging/rpm/fedora-26/docker-ce.spec
+++ b/components/packaging/rpm/fedora-26/docker-ce.spec
@ -65,7 +65,7 @@ pushd /go/src/github.com/docker/cli
 make VERSION=%{_origversion} GITCOMMIT=%{_gitcommit} dynbinary manpages # cli
 popd
 pushd engine
-for component in tini proxy runc containerd;do
+for component in tini "proxy dynamic" "runc all" "containerd dynamic";do
    TMP_GOPATH="/go" hack/dockerfile/install/install.sh $component
 done
 VERSION=%{_origversion} hack/make.sh dynbinary
--- a/components/packaging/rpm/fedora-27/docker-ce.spec
+++ b/components/packaging/rpm/fedora-27/docker-ce.spec
@ -66,7 +66,7 @@ pushd /go/src/github.com/docker/cli
 make VERSION=%{_origversion} GITCOMMIT=%{_gitcommit} dynbinary manpages # cli
 popd
 pushd engine
-for component in tini proxy runc containerd;do
+for component in tini "proxy dynamic" "runc all" "containerd dynamic";do
    TMP_GOPATH="/go" hack/dockerfile/install/install.sh $component
 done
 VERSION=%{_origversion} hack/make.sh dynbinary
Author	SHA1	Message	Date
Andrew Hsu	e7309590a2	Merge pull request #457 from andrewhsu/v [18.03] Bump version to 18.03.0-ce-rc3	2018-03-08 10:03:02 -08:00
Andrew Hsu	49e42a6151	Merge pull request #456 from andrewhsu/p [18.03] Use new 'dynamic' args in install.sh	2018-03-08 09:58:32 -08:00
Andrew Hsu	89ec01afcb	Bump version to 18.03.0-ce-rc3 Signed-off-by: Andrew Hsu <andrewhsu@docker.com>	2018-03-08 09:53:33 -08:00
Andrew Hsu	6fa0c6462e	Bump version to 18.03.0-ce-rc3 Signed-off-by: Andrew Hsu <andrewhsu@docker.com>	2018-03-08 09:48:32 -08:00
Eli Uriegas	2329a946f6	Use new 'dynamic' args in install.sh Scripts were changed around to do static by default, this changes so that we have "dynamic" inserted where it needs to be inserted Signed-off-by: Eli Uriegas <eli.uriegas@docker.com> (cherry picked from commit 130f74155e39ddc36b59d7c47867230284739710) Signed-off-by: Andrew Hsu <andrewhsu@docker.com>	2018-03-08 09:41:50 -08:00
Andrew Hsu	23a9017037	Merge pull request #455 from thaJeztah/18.03-fix_static_builds [18.03] fix static builds	2018-03-08 09:29:02 -08:00
Eli Uriegas	fb4173d8a8	buildmod => buildmode There was a typo with the buildmode flag for containerd Signed-off-by: Eli Uriegas <eli.uriegas@docker.com> (cherry picked from commit 5e4885b9afb1de30133627ce751af2c0e7b72a4e) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2018-03-08 15:45:32 +01:00
Eli Uriegas	3638dc65e4	Build containerd, runc, and proxy statically These were originally static binaries in the first place, this changes them back to that. Signed-off-by: Eli Uriegas <eli.uriegas@docker.com> (cherry picked from commit 63c7bb24637fdbfd905096ecc75b435ecefd31e9) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2018-03-08 15:45:24 +01:00