projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '19205-monitor-handler-threads'
[arvados.git]
/
build
/
package-build-dockerfiles
/
Makefile
diff --git
a/build/package-build-dockerfiles/Makefile
b/build/package-build-dockerfiles/Makefile
index 2592d8686bc9a8e5e53cd60d8890f1ffb7399200..b8f6315e79410f471230f88336cb297e98206c95 100644
(file)
--- a/
build/package-build-dockerfiles/Makefile
+++ b/
build/package-build-dockerfiles/Makefile
@@
-27,9
+27,10
@@
ubuntu2004/generated: common-generated-all
GOTARBALL_=DOES_NOT_EXIST
NODETARBALL_=DOES_NOT_EXIST
GOTARBALL_=DOES_NOT_EXIST
NODETARBALL_=DOES_NOT_EXIST
-GOTARBALL_x86_64=go1.17.1.linux-amd64.tar.gz
+GOVERSION=$(shell grep 'const goversion =' ../../lib/install/deps.go |awk -F'"' '{print $$2}')
+GOTARBALL_x86_64=go$(GOVERSION).linux-amd64.tar.gz
NODETARBALL_x86_64=node-v10.23.1-linux-x64.tar.xz
NODETARBALL_x86_64=node-v10.23.1-linux-x64.tar.xz
-GOTARBALL_aarch64=go
1.17.1
.linux-arm64.tar.gz
+GOTARBALL_aarch64=go
$(GOVERSION)
.linux-arm64.tar.gz
NODETARBALL_aarch64=node-v10.23.1-linux-arm64.tar.xz
# Get the bash variable $HOSTTYPE (this requires the SHELL line above)
NODETARBALL_aarch64=node-v10.23.1-linux-arm64.tar.xz
# Get the bash variable $HOSTTYPE (this requires the SHELL line above)