projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '18562-preemptible'
[arvados.git]
/
build
/
package-build-dockerfiles
/
Makefile
diff --git
a/build/package-build-dockerfiles/Makefile
b/build/package-build-dockerfiles/Makefile
index 818f2575254f91ab81cacdb04f9db055ad68e1b8..51fee9fce144f9978204a2b771d49b45b8473943 100644
(file)
--- a/
build/package-build-dockerfiles/Makefile
+++ b/
build/package-build-dockerfiles/Makefile
@@
-2,31
+2,30
@@
#
# SPDX-License-Identifier: AGPL-3.0
#
# SPDX-License-Identifier: AGPL-3.0
-all: centos7/generated debian
9/generated debian10/generated ubuntu1604/generated ubuntu18
04/generated
+all: centos7/generated debian
10/generated debian11/generated ubuntu1804/generated ubuntu20
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
- cp -rlt centos7/generated common-generated/*
-
-debian9/generated: common-generated-all
- test -d debian9/generated || mkdir debian9/generated
- cp -rlt debian9/generated common-generated/*
+ cp -f -rlt centos7/generated common-generated/*
debian10/generated: common-generated-all
test -d debian10/generated || mkdir debian10/generated
debian10/generated: common-generated-all
test -d debian10/generated || mkdir debian10/generated
- cp -rlt debian10/generated common-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/*
+
debian11
/generated: common-generated-all
+ test -d
debian11/generated || mkdir debian11
/generated
+ cp -
f -rlt debian11
/generated common-generated/*
ubuntu1804/generated: common-generated-all
test -d ubuntu1804/generated || mkdir ubuntu1804/generated
ubuntu1804/generated: common-generated-all
test -d ubuntu1804/generated || mkdir ubuntu1804/generated
- cp -rlt ubuntu1804/generated common-generated/*
+ cp -f -rlt ubuntu1804/generated common-generated/*
+
+ubuntu2004/generated: common-generated-all
+ test -d ubuntu2004/generated || mkdir ubuntu2004/generated
+ cp -f -rlt ubuntu2004/generated common-generated/*
-GOTARBALL=go1.1
3.4
.linux-amd64.tar.gz
-NODETARBALL=node-v
6.11.2
-linux-x64.tar.xz
+GOTARBALL=go1.1
7.1
.linux-amd64.tar.gz
+NODETARBALL=node-v
10.23.1
-linux-x64.tar.xz
RVMKEY1=mpapis.asc
RVMKEY2=pkuczynski.asc
RVMKEY1=mpapis.asc
RVMKEY2=pkuczynski.asc
@@
-36,7
+35,7
@@
common-generated/$(GOTARBALL): common-generated
wget -cqO common-generated/$(GOTARBALL) https://dl.google.com/go/$(GOTARBALL)
common-generated/$(NODETARBALL): common-generated
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/v
6.11.2
/$(NODETARBALL)
+ wget -cqO common-generated/$(NODETARBALL) https://nodejs.org/dist/v
10.23.1
/$(NODETARBALL)
common-generated/$(RVMKEY1): common-generated
wget -cqO common-generated/$(RVMKEY1) https://rvm.io/mpapis.asc
common-generated/$(RVMKEY1): common-generated
wget -cqO common-generated/$(RVMKEY1) https://rvm.io/mpapis.asc