projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'wtsi/python-api-timeout' refs #13542
[arvados.git]
/
build
/
package-build-dockerfiles
/
Makefile
diff --git
a/build/package-build-dockerfiles/Makefile
b/build/package-build-dockerfiles/Makefile
index e35056b5c079b04c275ec22b09df6a6b85f2b0b2..9dc536bf1eb919a7d334d3d18061db3dfd8c90d7 100644
(file)
--- a/
build/package-build-dockerfiles/Makefile
+++ b/
build/package-build-dockerfiles/Makefile
@@
-2,7
+2,7
@@
#
# SPDX-License-Identifier: AGPL-3.0
#
# SPDX-License-Identifier: AGPL-3.0
-all: centos7/generated debian8/generated debian9/generated ubuntu1
204/generated ubuntu1404/generated ubuntu16
04/generated
+all: centos7/generated debian8/generated debian9/generated ubuntu1
404/generated ubuntu1604/generated ubuntu18
04/generated
centos7/generated: common-generated-all
test -d centos7/generated || mkdir centos7/generated
centos7/generated: common-generated-all
test -d centos7/generated || mkdir centos7/generated
@@
-16,10
+16,6
@@
debian9/generated: common-generated-all
test -d debian9/generated || mkdir debian9/generated
cp -rlt debian9/generated common-generated/*
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/*
ubuntu1404/generated: common-generated-all
test -d ubuntu1404/generated || mkdir ubuntu1404/generated
cp -rlt ubuntu1404/generated common-generated/*
@@
-28,12
+24,20
@@
ubuntu1604/generated: common-generated-all
test -d ubuntu1604/generated || mkdir ubuntu1604/generated
cp -rlt ubuntu1604/generated common-generated/*
test -d ubuntu1604/generated || mkdir ubuntu1604/generated
cp -rlt ubuntu1604/generated common-generated/*
-GOTARBALL=go1.8.3.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
-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/$(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
common-generated:
mkdir common-generated