X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/ced114dfe4f8fda480a0d37fae9c0107c90f5cf7..38104975556f7a0a59c1a21a97aa37cd0e178d69:/build/package-build-dockerfiles/Makefile

diff --git a/build/package-build-dockerfiles/Makefile b/build/package-build-dockerfiles/Makefile
index 18694ed184..b8517b3b65 100644
--- a/build/package-build-dockerfiles/Makefile
+++ b/build/package-build-dockerfiles/Makefile
@@ -1,35 +1,47 @@
-all: centos6/generated centos7/generated debian7/generated debian8/generated ubuntu1204/generated ubuntu1404/generated
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
 
-centos6/generated: common-generated-all
-	test -d centos6/generated || mkdir centos6/generated
-	cp -rlt centos6/generated common-generated/*
+all: centos7/generated debian10/generated ubuntu1604/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/*
 
-debian7/generated: common-generated-all
-	test -d debian7/generated || mkdir debian7/generated
-	cp -rlt debian7/generated common-generated/*
+debian10/generated: common-generated-all
+	test -d debian10/generated || mkdir debian10/generated
+	cp -f -rlt debian10/generated common-generated/*
 
-debian8/generated: common-generated-all
-	test -d debian8/generated || mkdir debian8/generated
-	cp -rlt debian8/generated common-generated/*
+ubuntu1604/generated: common-generated-all
+	test -d ubuntu1604/generated || mkdir ubuntu1604/generated
+	cp -f -rlt ubuntu1604/generated common-generated/*
 
-ubuntu1204/generated: common-generated-all
-	test -d ubuntu1204/generated || mkdir ubuntu1204/generated
-	cp -rlt ubuntu1204/generated common-generated/*
+ubuntu1804/generated: common-generated-all
+	test -d ubuntu1804/generated || mkdir ubuntu1804/generated
+	cp -f -rlt ubuntu1804/generated common-generated/*
 
-ubuntu1404/generated: common-generated-all
-	test -d ubuntu1404/generated || mkdir ubuntu1404/generated
-	cp -rlt ubuntu1404/generated common-generated/*
+ubuntu2004/generated: common-generated-all
+	test -d ubuntu2004/generated || mkdir ubuntu2004/generated
+	cp -f -rlt ubuntu2004/generated common-generated/*
 
-GOTARBALL=go1.7.1.linux-amd64.tar.gz
+GOTARBALL=go1.13.4.linux-amd64.tar.gz
+NODETARBALL=node-v10.23.1-linux-x64.tar.xz
+RVMKEY1=mpapis.asc
+RVMKEY2=pkuczynski.asc
 
-common-generated-all: common-generated/$(GOTARBALL)
+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