X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/c3d17077625d53e82948cd2c5eaf08c6fb1466bd..refs/heads/21666-provision-test-improvement:/build/package-build-dockerfiles/Makefile

diff --git a/build/package-build-dockerfiles/Makefile b/build/package-build-dockerfiles/Makefile
index 4763b7a293..920d626483 100644
--- a/build/package-build-dockerfiles/Makefile
+++ b/build/package-build-dockerfiles/Makefile
@@ -2,42 +2,54 @@
 #
 # SPDX-License-Identifier: AGPL-3.0
 
-all: centos7/generated debian10/generated ubuntu1604/generated ubuntu1804/generated
+SHELL := '/bin/bash'
 
-centos7/generated: common-generated-all
-	test -d centos7/generated || mkdir centos7/generated
-	cp -f -rlt centos7/generated common-generated/*
+all: debian11/generated
+debian11/generated: common-generated-all
+	test -d debian11/generated || mkdir debian11/generated
+	cp -f -rlt debian11/generated common-generated/*
 
-debian10/generated: common-generated-all
-	test -d debian10/generated || mkdir debian10/generated
-	cp -f -rlt debian10/generated common-generated/*
+all: debian12/generated
+debian12/generated: common-generated-all
+	test -d debian12/generated || mkdir debian12/generated
+	cp -f -rlt debian12/generated common-generated/*
 
-ubuntu1604/generated: common-generated-all
-	test -d ubuntu1604/generated || mkdir ubuntu1604/generated
-	cp -f -rlt ubuntu1604/generated common-generated/*
+all: rocky8/generated
+rocky8/generated: common-generated-all
+	test -d rocky8/generated || mkdir rocky8/generated
+	cp -f -rlt rocky8/generated common-generated/*
 
-ubuntu1804/generated: common-generated-all
-	test -d ubuntu1804/generated || mkdir ubuntu1804/generated
-	cp -f -rlt ubuntu1804/generated common-generated/*
+all: ubuntu2004/generated
+ubuntu2004/generated: common-generated-all
+	test -d ubuntu2004/generated || mkdir ubuntu2004/generated
+	cp -f -rlt ubuntu2004/generated common-generated/*
 
-GOTARBALL=go1.13.4.linux-amd64.tar.gz
-NODETARBALL=node-v6.11.2-linux-x64.tar.xz
-RVMKEY1=mpapis.asc
-RVMKEY2=pkuczynski.asc
+all: ubuntu2204/generated
+ubuntu2204/generated: common-generated-all
+	test -d ubuntu2204/generated || mkdir ubuntu2204/generated
+	cp -f -rlt ubuntu2204/generated common-generated/*
 
-common-generated-all: common-generated/$(GOTARBALL) common-generated/$(NODETARBALL) common-generated/$(RVMKEY1) common-generated/$(RVMKEY2)
+GOTARBALL_=DOES_NOT_EXIST
+NODETARBALL_=DOES_NOT_EXIST
+GOVERSION=$(shell grep 'const goversion =' ../../lib/install/deps.go |awk -F'"' '{print $$2}')
+GOTARBALL_x86_64=go$(GOVERSION).linux-amd64.tar.gz
+NODETARBALL_x86_64=node-v12.22.12-linux-x64.tar.xz
+GOTARBALL_aarch64=go$(GOVERSION).linux-arm64.tar.gz
+NODETARBALL_aarch64=node-v12.22.12-linux-arm64.tar.xz
+
+# Get the bash variable $HOSTTYPE (this requires the SHELL line above)
+HOSTTYPE=$(shell echo $${HOSTTYPE})
+
+GOTARBALL=${GOTARBALL_$(HOSTTYPE)}
+NODETARBALL=${NODETARBALL_$(HOSTTYPE)}
+
+common-generated-all: common-generated/$(GOTARBALL) common-generated/$(NODETARBALL)
 
 common-generated/$(GOTARBALL): common-generated
 	wget -cqO common-generated/$(GOTARBALL) https://dl.google.com/go/$(GOTARBALL)
 
 common-generated/$(NODETARBALL): common-generated
-	wget -cqO common-generated/$(NODETARBALL) https://nodejs.org/dist/v6.11.2/$(NODETARBALL)
-
-common-generated/$(RVMKEY1): common-generated
-	wget -cqO common-generated/$(RVMKEY1) https://rvm.io/mpapis.asc
-
-common-generated/$(RVMKEY2): common-generated
-	wget -cqO common-generated/$(RVMKEY2) https://rvm.io/pkuczynski.asc
+	wget -cqO common-generated/$(NODETARBALL) https://nodejs.org/dist/v12.22.12/$(NODETARBALL)
 
 common-generated:
 	mkdir common-generated