X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/a78dce7bd57c1a6822e1949be4a5f13cf2447909..b36138dd447b5ff557cfbb0e00c28899a9c3af17:/build/package-build-dockerfiles/Makefile diff --git a/build/package-build-dockerfiles/Makefile b/build/package-build-dockerfiles/Makefile index cdd44d9c57..0406b0ae03 100644 --- a/build/package-build-dockerfiles/Makefile +++ b/build/package-build-dockerfiles/Makefile @@ -28,20 +28,24 @@ 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 +GOTARBALL=go1.12.7.linux-amd64.tar.gz NODETARBALL=node-v6.11.2-linux-x64.tar.xz -RVMKEY=rvm.asc +RVMKEY1=mpapis.asc +RVMKEY2=pkuczynski.asc -common-generated-all: common-generated/$(GOTARBALL) common-generated/$(NODETARBALL) common-generated/$(RVMKEY) +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/v6.11.2/$(NODETARBALL) -common-generated/$(RVMKEY): common-generated - wget -cqO common-generated/$(RVMKEY) https://rvm.io/mpapis.asc +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