summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlejandro Colomar <alx.manpages@gmail.com>2021-04-09 21:57:07 +0200
committerAlejandro Colomar <alx.manpages@gmail.com>2021-04-09 21:59:17 +0200
commitdb56735d5b872a67fffd9a7337b81dfcb2b0ee9e (patch)
treee50ccc85eb47c95c88a7fe7b88410cd94f9c93c1
parent2b34b0edb4c8401d2dcf651d44ea4b22be0b4aed (diff)
Makefile: Allow cross-architecture docker image building
Signed-off-by: Alejandro Colomar <alx.manpages@gmail.com>
-rw-r--r--Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 0d6d1a7..cb5256d 100644
--- a/Makefile
+++ b/Makefile
@@ -17,14 +17,15 @@ INSTALL = install
INSTALL_DATA = $(INSTALL) -m 644
INSTALL_DIR = $(INSTALL) -m 755 -d
-arch = $(shell uname -m)
+current_arch = $(shell uname -m)
+arch = $(shell uname -m)
build = $(CURDIR)/etc/docker/images/build-essential
build_reg = $(shell <$(build) grep '^reg' | cut -f2)
build_user = $(shell <$(build) grep '^user' | cut -f2)
build_repo = $(shell <$(build) grep '^repo' | cut -f2)
build_lbl = $(shell <$(build) grep '^lbl' | cut -f2)
-build_digest = $(shell <$(build) grep '^digest' | grep $(arch) | cut -f3)
+build_digest = $(shell <$(build) grep '^digest' | grep $(current_arch) | cut -f3)
nginx = $(CURDIR)/etc/docker/images/nginx
nginx_reg = $(shell <$(nginx) grep '^reg' | cut -f2)