Merge branch 'master' of git.curoverse.com:arvados into 11876-r-sdk

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

diff --git a/build/package-build-dockerfiles/Makefile b/build/package-build-dockerfiles/Makefile
index 5fae9dc589412ccdd449335ae1a82d41065c232d..396370dad7c44d6a7393ab93ac8801d559ba34af 100644 (file)
--- a/build/package-build-dockerfiles/Makefile
+++ b/build/package-build-dockerfiles/Makefile
@@ -1,4 +1,8 @@
-all: centos7/generated debian8/generated ubuntu1204/generated ubuntu1404/generated ubuntu1604/generated
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
+all: centos7/generated debian8/generated debian9/generated ubuntu1204/generated ubuntu1404/generated ubuntu1604/generated
 
 centos7/generated: common-generated-all
        test -d centos7/generated || mkdir centos7/generated
@@ -8,6 +12,10 @@ 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/*
@@ -20,12 +28,16 @@ ubuntu1604/generated: common-generated-all
        test -d ubuntu1604/generated || mkdir ubuntu1604/generated
        cp -rlt ubuntu1604/generated common-generated/*
 
-GOTARBALL=go1.7.1.linux-amd64.tar.gz
+GOTARBALL=go1.8.3.linux-amd64.tar.gz
+NODETARBALL=node-v6.11.2-linux-x64.tar.xz
 
-common-generated-all: common-generated/$(GOTARBALL)
+common-generated-all: common-generated/$(GOTARBALL) common-generated/$(NODETARBALL)
 
 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:
        mkdir common-generated