Merge branch '17246-salt-install-improvements'

[arvados.git] / build / package-build-dockerfiles / Makefile

diff --git a/build/package-build-dockerfiles/Makefile b/build/package-build-dockerfiles/Makefile
index e35056b5c079b04c275ec22b09df6a6b85f2b0b2..b8517b3b6506274a902949d09923e22bf0d3d581 100644 (file)
--- a/build/package-build-dockerfiles/Makefile
+++ b/build/package-build-dockerfiles/Makefile
@@ -2,38 +2,46 @@
 #
 # SPDX-License-Identifier: AGPL-3.0
 
-all: centos7/generated debian8/generated debian9/generated ubuntu1204/generated ubuntu1404/generated ubuntu1604/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/*
 
-debian8/generated: common-generated-all
-       test -d debian8/generated || mkdir debian8/generated
-       cp -rlt debian8/generated common-generated/*
-
-debian9/generated: common-generated-all
-       test -d debian9/generated || mkdir debian9/generated
-       cp -rlt debian9/generated common-generated/*
-
-ubuntu1204/generated: common-generated-all
-       test -d ubuntu1204/generated || mkdir ubuntu1204/generated
-       cp -rlt ubuntu1204/generated common-generated/*
-
-ubuntu1404/generated: common-generated-all
-       test -d ubuntu1404/generated || mkdir ubuntu1404/generated
-       cp -rlt ubuntu1404/generated common-generated/*
+debian10/generated: common-generated-all
+       test -d debian10/generated || mkdir debian10/generated
+       cp -f -rlt debian10/generated common-generated/*
 
 ubuntu1604/generated: common-generated-all
        test -d ubuntu1604/generated || mkdir ubuntu1604/generated
-       cp -rlt ubuntu1604/generated common-generated/*
+       cp -f -rlt ubuntu1604/generated common-generated/*
+
+ubuntu1804/generated: common-generated-all
+       test -d ubuntu1804/generated || mkdir ubuntu1804/generated
+       cp -f -rlt ubuntu1804/generated common-generated/*
 
-GOTARBALL=go1.8.3.linux-amd64.tar.gz
+ubuntu2004/generated: common-generated-all
+       test -d ubuntu2004/generated || mkdir ubuntu2004/generated
+       cp -f -rlt ubuntu2004/generated common-generated/*
 
-common-generated-all: common-generated/$(GOTARBALL)
+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/$(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