X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/d695d417a40ab9900cc4dd6d097cc5571f0bf310..30298819bc92b5ec90c8544bee7e102cb64e888d:/build/package-build-dockerfiles/Makefile?ds=sidebyside

diff --git a/build/package-build-dockerfiles/Makefile b/build/package-build-dockerfiles/Makefile
index 9216f8264b..5232050213 100644
--- a/build/package-build-dockerfiles/Makefile
+++ b/build/package-build-dockerfiles/Makefile
@@ -1,29 +1,51 @@
-all: centos6/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 debian8/generated debian9/generated ubuntu1404/generated ubuntu1604/generated ubuntu1804/generated
 
-debian7/generated: common-generated-all
-	test -d debian7/generated || mkdir debian7/generated
-	cp -rlt debian7/generated common-generated/*
+centos7/generated: common-generated-all
+	test -d centos7/generated || mkdir centos7/generated
+	cp -rlt centos7/generated common-generated/*
 
 debian8/generated: common-generated-all
 	test -d debian8/generated || mkdir debian8/generated
 	cp -rlt debian8/generated common-generated/*
 
-ubuntu1204/generated: common-generated-all
-	test -d ubuntu1204/generated || mkdir ubuntu1204/generated
-	cp -rlt ubuntu1204/generated common-generated/*
+debian9/generated: common-generated-all
+	test -d debian9/generated || mkdir debian9/generated
+	cp -rlt debian9/generated common-generated/*
 
 ubuntu1404/generated: common-generated-all
 	test -d ubuntu1404/generated || mkdir ubuntu1404/generated
 	cp -rlt ubuntu1404/generated common-generated/*
 
-common-generated-all: common-generated/golang-amd64.tar.gz
+ubuntu1604/generated: common-generated-all
+	test -d ubuntu1604/generated || mkdir ubuntu1604/generated
+	cp -rlt ubuntu1604/generated common-generated/*
 
-common-generated/golang-amd64.tar.gz: common-generated
-	wget -cqO common-generated/golang-amd64.tar.gz http://storage.googleapis.com/golang/go1.4.2.linux-amd64.tar.gz
+ubuntu1804/generated: common-generated-all
+	test -d ubuntu1804/generated || mkdir ubuntu1804/generated
+	cp -rlt ubuntu1804/generated common-generated/*
+
+GOTARBALL=go1.10.1.linux-amd64.tar.gz
+NODETARBALL=node-v6.11.2-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)
+
+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
 
 common-generated:
 	mkdir common-generated