diff options
| author | Dennis Chen <dennis.chen@arm.com> | 2018-03-09 06:49:26 +0000 |
|---|---|---|
| committer | Dennis Chen <dennis.chen@arm.com> | 2018-03-12 02:05:37 +0000 |
| commit | 8eb7ed673b687ae17e2c7df5dd40f8081c299bc2 (patch) | |
| tree | 79cc95bc2f7d5c7cb622e7d80461f33088518732 /hack/make | |
| parent | 162f9aee476bd204c2b0146c0128949182e8bd5e (diff) | |
| download | docker-8eb7ed673b687ae17e2c7df5dd40f8081c299bc2.tar.gz | |
Remove arch-suffix detection of Dockerfile
Since now we have only one Dockerfile, so the arch-specific suffix
of the Dockerfile is not needed anymore.
Signed-off-by: Dennis Chen <dennis.chen@arm.com>
Diffstat (limited to 'hack/make')
| -rw-r--r-- | hack/make/.detect-daemon-osarch | 35 |
1 files changed, 5 insertions, 30 deletions
diff --git a/hack/make/.detect-daemon-osarch b/hack/make/.detect-daemon-osarch index c472710d17..91e2c53c75 100644 --- a/hack/make/.detect-daemon-osarch +++ b/hack/make/.detect-daemon-osarch @@ -34,35 +34,10 @@ export DOCKER_CLIENT_GOOS="${DOCKER_CLIENT_OSARCH%/*}" export DOCKER_CLIENT_GOARCH="${DOCKER_CLIENT_OSARCH##*/}" DOCKER_CLIENT_GOARCH=${DOCKER_CLIENT_GOARCH:=amd64} -# Retrieve the architecture used in contrib/builder/(deb|rpm)/$PACKAGE_ARCH/ -PACKAGE_ARCH='amd64' -case "${DOCKER_ENGINE_GOARCH:-$DOCKER_CLIENT_GOARCH}" in - arm) - PACKAGE_ARCH='armhf' - ;; - arm64) - PACKAGE_ARCH='aarch64' - ;; - amd64|ppc64le|s390x) - PACKAGE_ARCH="${DOCKER_ENGINE_GOARCH:-$DOCKER_CLIENT_GOARCH}" - ;; - *) - echo >&2 "warning: not sure how to convert '$DOCKER_ENGINE_GOARCH' to a 'Docker' arch, assuming '$PACKAGE_ARCH'" - ;; -esac -export PACKAGE_ARCH - DOCKERFILE='Dockerfile' -case "$PACKAGE_ARCH" in - amd64) - case "${DOCKER_ENGINE_GOOS:-$DOCKER_CLIENT_GOOS}" in - windows) - DOCKERFILE='Dockerfile.windows' - ;; - esac - ;; - *) - DOCKERFILE="Dockerfile.$PACKAGE_ARCH" - ;; -esac + +if [ "${DOCKER_ENGINE_GOOS:-$DOCKER_CLIENT_GOOS}" = "windows" ]; then + DOCKERFILE='Dockerfile.windows' +fi + export DOCKERFILE |