Merge pull request docker-archive#9 from seemethere/deb_dockerfiles_n…

…aming_update Update deb dockerfiles to $(uname -m) names
silvin-lubecki · May 31, 2017 · 10ce75b · 10ce75b
2 parents 121e1c4 + 930db40
commit 10ce75b
Show file tree

Hide file tree

Showing 15 changed files with 1 addition and 1 deletion.
diff --git a/deb/Makefile b/deb/Makefile
@@ -1,6 +1,6 @@
 SHELL:=/bin/bash
 ALPINE:=$(shell $(CURDIR)/../detect_alpine_image)
-ARCH:=amd64
+ARCH:=$(shell uname -m)
 ENGINE_DIR:=$(CURDIR)/../../engine
 CLI_DIR:=$(CURDIR)/../../cli
 GITCOMMIT?=$(shell cd $(ENGINE_DIR) && git rev-parse --short HEAD)

diff --git a/deb/debian-jessie/Dockerfile.armhf → deb/debian-jessie/Dockerfile.armv7l b/deb/debian-jessie/Dockerfile.armhf → deb/debian-jessie/Dockerfile.armv7l
diff --git a/deb/debian-jessie/Dockerfile.amd64 → deb/debian-jessie/Dockerfile.x86_64 b/deb/debian-jessie/Dockerfile.amd64 → deb/debian-jessie/Dockerfile.x86_64
diff --git a/deb/debian-stretch/Dockerfile.armhf → deb/debian-stretch/Dockerfile.armv7l b/deb/debian-stretch/Dockerfile.armhf → deb/debian-stretch/Dockerfile.armv7l
diff --git a/deb/debian-stretch/Dockerfile.amd64 → deb/debian-stretch/Dockerfile.x86_64 b/deb/debian-stretch/Dockerfile.amd64 → deb/debian-stretch/Dockerfile.x86_64
diff --git a/deb/debian-wheezy/Dockerfile.armhf → deb/debian-wheezy/Dockerfile.armv7l b/deb/debian-wheezy/Dockerfile.armhf → deb/debian-wheezy/Dockerfile.armv7l
diff --git a/deb/debian-wheezy/Dockerfile.amd64 → deb/debian-wheezy/Dockerfile.x86_64 b/deb/debian-wheezy/Dockerfile.amd64 → deb/debian-wheezy/Dockerfile.x86_64
diff --git a/deb/ubuntu-trusty/Dockerfile.armhf → deb/ubuntu-trusty/Dockerfile.armv7l b/deb/ubuntu-trusty/Dockerfile.armhf → deb/ubuntu-trusty/Dockerfile.armv7l
diff --git a/deb/ubuntu-trusty/Dockerfile.amd64 → deb/ubuntu-trusty/Dockerfile.x86_64 b/deb/ubuntu-trusty/Dockerfile.amd64 → deb/ubuntu-trusty/Dockerfile.x86_64
diff --git a/deb/ubuntu-xenial/Dockerfile.armhf → deb/ubuntu-xenial/Dockerfile.armv7l b/deb/ubuntu-xenial/Dockerfile.armhf → deb/ubuntu-xenial/Dockerfile.armv7l
diff --git a/deb/ubuntu-xenial/Dockerfile.amd64 → deb/ubuntu-xenial/Dockerfile.x86_64 b/deb/ubuntu-xenial/Dockerfile.amd64 → deb/ubuntu-xenial/Dockerfile.x86_64
diff --git a/deb/ubuntu-yakkety/Dockerfile.armhf → deb/ubuntu-yakkety/Dockerfile.armv7l b/deb/ubuntu-yakkety/Dockerfile.armhf → deb/ubuntu-yakkety/Dockerfile.armv7l
diff --git a/deb/ubuntu-yakkety/Dockerfile.amd64 → deb/ubuntu-yakkety/Dockerfile.x86_64 b/deb/ubuntu-yakkety/Dockerfile.amd64 → deb/ubuntu-yakkety/Dockerfile.x86_64
diff --git a/deb/ubuntu-zesty/Dockerfile.armhf → deb/ubuntu-zesty/Dockerfile.armv7l b/deb/ubuntu-zesty/Dockerfile.armhf → deb/ubuntu-zesty/Dockerfile.armv7l
diff --git a/deb/ubuntu-zesty/Dockerfile.amd64 → deb/ubuntu-zesty/Dockerfile.x86_64 b/deb/ubuntu-zesty/Dockerfile.amd64 → deb/ubuntu-zesty/Dockerfile.x86_64