X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/2aa6adffd7a89601510b39481a071ba03213f6fd..469521bb7ea65a68f04a7595d3b6b10264026db6:/build/package-build-dockerfiles/Makefile

diff --git a/build/package-build-dockerfiles/Makefile b/build/package-build-dockerfiles/Makefile
index 9987e9e0eb..b8f6315e79 100644
--- a/build/package-build-dockerfiles/Makefile
+++ b/build/package-build-dockerfiles/Makefile
@@ -1,27 +1,60 @@
-all: centos7/generated debian8/generated ubuntu1204/generated ubuntu1404/generated
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
+SHELL := '/bin/bash'
+all: centos7/generated debian10/generated debian11/generated ubuntu1804/generated ubuntu2004/generated
 
 centos7/generated: common-generated-all
 	test -d centos7/generated || mkdir centos7/generated
-	cp -rlt centos7/generated common-generated/*
+	cp -f -rlt centos7/generated common-generated/*
+
+debian10/generated: common-generated-all
+	test -d debian10/generated || mkdir debian10/generated
+	cp -f -rlt debian10/generated common-generated/*
+
+debian11/generated: common-generated-all
+	test -d debian11/generated || mkdir debian11/generated
+	cp -f -rlt debian11/generated common-generated/*
+
+ubuntu1804/generated: common-generated-all
+	test -d ubuntu1804/generated || mkdir ubuntu1804/generated
+	cp -f -rlt ubuntu1804/generated common-generated/*
 
-debian8/generated: common-generated-all
-	test -d debian8/generated || mkdir debian8/generated
-	cp -rlt debian8/generated common-generated/*
+ubuntu2004/generated: common-generated-all
+	test -d ubuntu2004/generated || mkdir ubuntu2004/generated
+	cp -f -rlt ubuntu2004/generated common-generated/*
 
-ubuntu1204/generated: common-generated-all
-	test -d ubuntu1204/generated || mkdir ubuntu1204/generated
-	cp -rlt ubuntu1204/generated common-generated/*
+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-v10.23.1-linux-x64.tar.xz
+GOTARBALL_aarch64=go$(GOVERSION).linux-arm64.tar.gz
+NODETARBALL_aarch64=node-v10.23.1-linux-arm64.tar.xz
 
-ubuntu1404/generated: common-generated-all
-	test -d ubuntu1404/generated || mkdir ubuntu1404/generated
-	cp -rlt ubuntu1404/generated common-generated/*
+# Get the bash variable $HOSTTYPE (this requires the SHELL line above)
+HOSTTYPE=$(shell echo $${HOSTTYPE})
 
-GOTARBALL=go1.7.1.linux-amd64.tar.gz
+GOTARBALL=${GOTARBALL_$(HOSTTYPE)}
+NODETARBALL=${NODETARBALL_$(HOSTTYPE)}
 
-common-generated-all: common-generated/$(GOTARBALL)
+RVMKEY1=mpapis.asc
+RVMKEY2=pkuczynski.asc
+
+common-generated-all: common-generated/$(GOTARBALL) common-generated/$(NODETARBALL) common-generated/$(RVMKEY1) common-generated/$(RVMKEY2)
 
 common-generated/$(GOTARBALL): common-generated
-	wget -cqO common-generated/$(GOTARBALL) http://storage.googleapis.com/golang/$(GOTARBALL)
+	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/v10.23.1/$(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
 
 common-generated:
 	mkdir common-generated