[ARVADOS-WORKBENCH2] updated: 2.3.0-196-gebb5bf6f

[Git user]

Summary of changes:
 Makefile          | 11 +++++++++--
 docker/Dockerfile | 24 ++++++++++++++----------
 2 files changed, 23 insertions(+), 12 deletions(-)

       via  ebb5bf6fc93912af4013cb74b751e877c292eee7 (commit)
       via  a952fb030d5744b12dbf65da33f2c3651c4d8c8e (commit)
      from  cfa81dfc3041cb459c8a0918a2732dfcf3a11d40 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit ebb5bf6fc93912af4013cb74b751e877c292eee7
Author: Ward Vandewege <ward at curii.com>
Date:   Wed Mar 16 14:17:32 2022 -0400

    18848: update the Dockerfile for package building to automatically pick
           up the correct Go version.
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 3bffcac4..6c3935c3 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -12,17 +12,21 @@ RUN apt-get update && \
     libpam0g-dev libgbm1 git && \
     apt-get clean
 
-# Get Go 1.16.9
-RUN cd /usr/src && \
-    wget https://golang.org/dl/go1.16.9.linux-amd64.tar.gz && \
-    tar xzf go1.16.9.linux-amd64.tar.gz && \
-    ln -s /usr/src/go/bin/go /usr/local/bin/go-1.16.9 && \
-    ln -s /usr/src/go/bin/gofmt /usr/local/bin/gofmt-1.16.9 && \
-    ln -s /usr/local/bin/go-1.16.9 /usr/local/bin/go && \
-    ln -s /usr/local/bin/gofmt-1.16.9 /usr/local/bin/gofmt
-
 RUN gem install --no-ri --no-rdoc fpm
-RUN git clone https://git.arvados.org/arvados.git && cd arvados && \
+RUN cd /usr/src && git clone https://git.arvados.org/arvados.git && \
+    cd arvados && \
+    GO_VERSION=$(grep 'goversion =' lib/install/deps.go |awk -F'"' '{print $2}') && \
+    echo $GO_VERSION && \
+    cd /usr/src && \
+    wget https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz && \
+    tar xzf go${GO_VERSION}.linux-amd64.tar.gz && \
+    ln -s /usr/src/go/bin/go /usr/local/bin/go-${GO_VERSION} && \
+    ln -s /usr/src/go/bin/gofmt /usr/local/bin/gofmt-${GO_VERSION} && \
+    ln -s /usr/local/bin/go-${GO_VERSION} /usr/local/bin/go && \
+    ln -s /usr/local/bin/gofmt-${GO_VERSION} /usr/local/bin/gofmt
+
+RUN cd /usr/src/arvados && \
+    apt-get update && \
     go mod download && \
     go run ./cmd/arvados-server install -type test && cd .. && \
     rm -rf arvados && \

commit a952fb030d5744b12dbf65da33f2c3651c4d8c8e
Author: Ward Vandewege <ward at curii.com>
Date:   Wed Mar 16 14:15:28 2022 -0400

    18848: need to define a few variables before running yarn build. Also,
           check that ARVADOS_DIRECTORY is set when the packages-in-docker
           make target is executed.
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>

diff --git a/Makefile b/Makefile
index ab58fc58..2236f9de 100644
--- a/Makefile
+++ b/Makefile
@@ -12,6 +12,9 @@ APP_NAME?=arvados-workbench2
 # something in the lines of 1.2.0.20180612145021, this will be the package version
 # it can be overwritten when invoking make as in make packages VERSION=1.2.0
 VERSION?=$(shell ./version-at-commit.sh HEAD)
+# We don't use BUILD_NUMBER at the moment, but it needs to be defined
+BUILD_NUMBER?=0
+GIT_COMMIT?=$(shell git rev-parse --short HEAD)
 
 # ITERATION is the package iteration, intended for manual change if anything non-code related
 # changes in the package. (i.e. example config files externally added
@@ -83,7 +86,7 @@ integration-tests-in-docker: workbench2-build-image
 test: unit-tests integration-tests
 
 build: yarn-install
-	VERSION=$(VERSION) yarn build
+	VERSION=$(VERSION) BUILD_NUMBER=$(BUILD_NUMBER) GIT_COMMIT=$(GIT_COMMIT) yarn build
 
 $(DEB_FILE): build
 	fpm \
@@ -132,7 +135,11 @@ copy: $(DEB_FILE) $(RPM_FILE)
 # use FPM to create DEB and RPM
 packages: copy
 
-packages-in-docker: workbench2-build-image
+check-arvados-directory:
+	@if test "${ARVADOS_DIRECTORY}" == "unset"; then echo "the environment variable ARVADOS_DIRECTORY must be set to the path of an arvados git checkout"; exit 1; fi
+	@if ! test -d "${ARVADOS_DIRECTORY}"; then echo "the environment variable ARVADOS_DIRECTORY does not point at a directory"; exit 1; fi
+
+packages-in-docker: check-arvados-directory workbench2-build-image
 	docker run --env ci="true" \
 		--env ARVADOS_DIRECTORY=/tmp/arvados \
 		--env APP_NAME=${APP_NAME} \

-----------------------------------------------------------------------


hooks/post-receive
--