Merge pull request #547 from vvoland/docker-community

pkg/docker: Show the platform name on the Client line of static CLI builds

Author: vvoland

pkg/docker-cli/Dockerfile

@@ -186,6 +186,7 @@ ENV PATH="$PATH:/usr/local/go/bin:$GOPATH/bin"
 ENV CGO_ENABLED="0"
 ENV GOTOOLCHAIN="local"
 ENV GO111MODULE="off"
+ARG DOCKER_PLATFORM_NAME
 
 FROM build-base-static AS goversioninfo
 ARG GOVERSIONINFO_VERSION

pkg/docker-cli/scripts/pkg-static-build.sh

@@ -16,6 +16,8 @@
 
 : "${NIGHTLY_BUILD=}"
 
+: "${DOCKER_PLATFORM_NAME=}"
+
 : "${PKG_NAME=}"
 
 : "${BUILDDIR=/work/build}"
@@ -63,7 +65,7 @@ clibin="docker${binext}"
 (
   set -x
   pushd ${SRCDIR}
-    VERSION=${GENVER_VERSION#v} GITCOMMIT=${GENVER_COMMIT_SHORT} GO_LINKMODE=static TARGET=${BUILDDIR}/${PKG_NAME} ./scripts/build/binary
+    PLATFORM="${DOCKER_PLATFORM_NAME}" VERSION=${GENVER_VERSION#v} GITCOMMIT=${GENVER_COMMIT_SHORT} GO_LINKMODE=static TARGET=${BUILDDIR}/${PKG_NAME} ./scripts/build/binary
   popd
   xx-verify --static "${BUILDDIR}/${PKG_NAME}/docker"
 )

pkg/docker-engine/scripts/pkg-static-build.sh

@@ -62,7 +62,7 @@ mkdir -p ${BUILDDIR}/${PKG_NAME}
 (
   set -x
   pushd ${SRCDIR}
-    CGO_ENABLED=1 VERSION=${GENVER_VERSION#v} DOCKER_GITCOMMIT=${GENVER_COMMIT_SHORT} PLATFORM="${DOCKER_PLATFORM_NAME}" DEFAULT_PRODUCT_LICENSE="${DOCKER_PRODUCT_LICENSE}" ./hack/make.sh binary
+    CGO_ENABLED=1 VERSION=${GENVER_VERSION#v} DOCKER_GITCOMMIT=${GENVER_COMMIT_SHORT} PLATFORM="${DOCKER_PLATFORM_NAME}" PRODUCT=docker DEFAULT_PRODUCT_LICENSE="${DOCKER_PRODUCT_LICENSE}" ./hack/make.sh binary
     mv "./bundles/binary-daemon/dockerd${binext}" "${BUILDDIR}/${PKG_NAME}/"
     if [ "$(xx-info os)" != "windows" ]; then
       mv "./bundles/binary-daemon/docker-proxy${binext}" "${BUILDDIR}/${PKG_NAME}/"

pkg/docker/Dockerfile

@@ -139,6 +139,7 @@ ENV GOPROXY="https://proxy.golang.org|direct"
 ENV GOPATH="/go"
 ENV PATH="$PATH:/usr/local/go/bin:$GOPATH/bin"
 ENV GOTOOLCHAIN="local"
+ARG DOCKER_PLATFORM_NAME
 
 FROM build-base-static AS gowinres
 ARG GOWINRES_VERSION
@@ -156,7 +157,6 @@ ARG PKG_NAME
 ARG PKG_REF
 ARG CLI_REF
 ARG DOCKER_VERSION
-ARG DOCKER_PLATFORM_NAME
 ARG DOCKER_PRODUCT_LICENSE
 ARG NIGHTLY_BUILD
 ARG TAGPREFIX

pkg/docker/scripts/pkg-static-build.sh

@@ -104,7 +104,7 @@ fetch_git_ref() {
 (
   set -x
   pushd "${ENGINE_SRCDIR}"
-    CGO_ENABLED=1 VERSION="${version}" DOCKER_GITCOMMIT="${ENGINE_GENVER_COMMIT_SHORT}" PLATFORM="${DOCKER_PLATFORM_NAME}" DEFAULT_PRODUCT_LICENSE="${DOCKER_PRODUCT_LICENSE}" ./hack/make.sh binary
+    CGO_ENABLED=1 VERSION="${version}" DOCKER_GITCOMMIT="${ENGINE_GENVER_COMMIT_SHORT}" PLATFORM="${DOCKER_PLATFORM_NAME}" PRODUCT=docker DEFAULT_PRODUCT_LICENSE="${DOCKER_PRODUCT_LICENSE}" ./hack/make.sh binary
     mv "./bundles/binary-daemon/dockerd${binext}" "${engine_builddir}/"
     if [ "$(xx-info os)" != "windows" ]; then
       mv "./bundles/binary-daemon/docker-proxy${binext}" "${engine_builddir}/"
@@ -131,7 +131,7 @@ fi
 (
   set -x
   pushd "${CLI_SRCDIR}"
-    CGO_ENABLED=0 GO111MODULE=off VERSION="${version}" GITCOMMIT="${CLI_GENVER_COMMIT_SHORT}" GO_LINKMODE=static TARGET="${cli_builddir}" ./scripts/build/binary
+    CGO_ENABLED=0 GO111MODULE=off PLATFORM="${DOCKER_PLATFORM_NAME}" VERSION="${version}" GITCOMMIT="${CLI_GENVER_COMMIT_SHORT}" GO_LINKMODE=static TARGET="${cli_builddir}" ./scripts/build/binary
   popd
   xx-verify --static "${cli_builddir}/docker"
 )

pkg/docker/scripts/pkg-static-darwin-build.sh

@@ -14,6 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+: "${DOCKER_PLATFORM_NAME=}"
+
 : "${BUILDDIR=/work/build}"
 : "${CLI_SRCDIR=/work/cli-src}"
 : "${OUTDIR=/out}"
@@ -53,7 +55,7 @@ mkdir -p "$cli_builddir"
 (
   set -x
   cd "${CLI_SRCDIR}"
-  CGO_ENABLED=0 GO111MODULE=off VERSION="${VERSION#v}" GITCOMMIT="${CLI_COMMIT:0:7}" GO_LINKMODE=static TARGET="${cli_builddir}" ./scripts/build/binary
+  CGO_ENABLED=0 GO111MODULE=off PLATFORM="${DOCKER_PLATFORM_NAME}" VERSION="${VERSION#v}" GITCOMMIT="${CLI_COMMIT:0:7}" GO_LINKMODE=static TARGET="${cli_builddir}" ./scripts/build/binary
 )
 xx-verify --static "${cli_builddir}/docker"