Merge pull request #62 from andrewhsu/al

no need to detect arch for alpine image
Upstream-commit: 33ee027e04a43651f953bbc080eb020b84fd53cc
Component: packaging

components/packaging/deb/Makefile

@@ -1,12 +1,11 @@
 SHELL:=/bin/bash
-ALPINE_IMG:=$(shell $(CURDIR)/../detect_alpine_image)
 ARCH:=$(shell uname -m)
 ENGINE_DIR:=$(CURDIR)/../../engine
 CLI_DIR:=$(CURDIR)/../../cli
 GITCOMMIT?=$(shell cd $(ENGINE_DIR) && git rev-parse --short HEAD)
 VERSION?=$(shell cat $(ENGINE_DIR)/VERSION)
 DOCKER_EXPERIMENTAL:=0
-CHOWN:=docker run --rm -v $(CURDIR):/v -w /v $(ALPINE_IMG) chown
+CHOWN:=docker run --rm -v $(CURDIR):/v -w /v alpine chown
 
 .PHONY: help clean deb ubuntu debian ubuntu-xenial ubuntu-trusty ubuntu-zesty debian-buster debian-jessie debian-stretch debian-wheezy raspbian-jessie raspbian-stretch
 

components/packaging/detect_alpine_image

@@ -1,21 +0,0 @@
-#!/usr/bin/env sh
-
-arch="$(uname -m)"
-img="unknown"
-
-if [ "$arch" = "x86_64" ]; then
-    img="alpine"
-elif [ "$arch" = "armv7l" ]; then
-    img="arm32v6/alpine"
-elif [ "$arch" = "s390x" ]; then
-    img="s390x/alpine"
-elif [ "$arch" = "aarch64" ]; then
-    img="arm64v8/alpine"
-elif [ "$arch" = "ppc64le" ]; then
-    img="ppc64le/alpine"
-else
-    echo "Architecture $(arch) not supported"
-    exit 1;
-fi
-
-echo "$img"

components/packaging/rpm/Makefile

@@ -1,12 +1,11 @@
 ARCH=$(shell uname -m)
-ALPINE_IMG:=$(shell $(CURDIR)/../detect_alpine_image)
 ENGINE_DIR:=$(CURDIR)/../../engine
 CLI_DIR:=$(CURDIR)/../../cli
 GITCOMMIT=$(shell cd $(ENGINE_DIR) && git rev-parse --short HEAD)
 VERSION=$(shell cat $(ENGINE_DIR)/VERSION)
 DOCKER_EXPERIMENTAL=0
 GEN_RPM_VER=$(shell ./gen-rpm-ver $(ENGINE_DIR) $(VERSION))
-CHOWN=docker run --rm -i -v $(CURDIR):/v -w /v $(ALPINE_IMG) chown
+CHOWN=docker run --rm -i -v $(CURDIR):/v -w /v alpine chown
 RPMBUILD=docker run --privileged --rm -i\
 	-v $(CURDIR)/rpmbuild/SOURCES:/root/rpmbuild/SOURCES \
 	-v $(CURDIR)/rpmbuild/BUILD:/root/rpmbuild/BUILD \
@@ -62,7 +61,7 @@ rpmbuild/SOURCES/cli.tgz:
 	docker run --rm -i -w /v \
 		-v $(CLI_DIR):/cli \
 		-v $(CURDIR)/rpmbuild/SOURCES:/v \
-		$(ALPINE_IMG) \
+		alpine \
 		tar -C / -c -z -f /v/cli.tgz --exclude .git cli
 
 rpmbuild/SOURCES/engine.tgz:
@@ -70,5 +69,5 @@ rpmbuild/SOURCES/engine.tgz:
 	docker run --rm -i -w /v \
 		-v $(ENGINE_DIR):/engine \
 		-v $(CURDIR)/rpmbuild/SOURCES:/v \
-		$(ALPINE_IMG) \
+		alpine \
 		tar -C / -c -z -f /v/engine.tgz --exclude .git engine

components/packaging/static/Makefile

@@ -1,9 +1,8 @@
 SHELL:=/bin/bash
-ALPINE_IMG:=$(shell $(CURDIR)/../detect_alpine_image)
 ENGINE_DIR:=$(CURDIR)/../../engine
 CLI_DIR:=$(CURDIR)/../../cli
 VERSION=$(shell cat $(ENGINE_DIR)/VERSION)
-CHOWN=docker run --rm -v $(CURDIR):/v -w /v $(ALPINE_IMG) chown
+CHOWN=docker run --rm -v $(CURDIR):/v -w /v alpine chown
 HASH_CMD=docker run -v $(CURDIR):/sum -w /sum debian:jessie bash hash_files
 DIR_TO_HASH:=build/linux
 
@@ -39,7 +38,7 @@ cross-win: cross-all-cli cross-win-engine ## create zip file with windows x86_64
 	mkdir -p build/win/docker
 	cp $(CLI_DIR)/build/docker-windows-amd64 build/win/docker/docker.exe
 	cp $(ENGINE_DIR)/bundles/cross/windows/amd64/dockerd-$(VERSION).exe build/win/docker/dockerd.exe
-	docker run --rm -v $(CURDIR)/build/win:/v -w /v $(ALPINE_IMG) sh -c 'apk update&&apk add zip&&zip -r docker-$(VERSION).zip docker'
+	docker run --rm -v $(CURDIR)/build/win:/v -w /v alpine sh -c 'apk update&&apk add zip&&zip -r docker-$(VERSION).zip docker'
 	$(CHOWN) -R $(shell id -u):$(shell id -g) build
 
 cross-arm: cross-all-cli ## create tgz with linux armhf client only