Build script fix: make sure that run-build-docker-jobs-image.sh always

rebuilds the jobs image when the git commit passed in via --tags
changes.

No issue #

diff --git a/build/run-build-docker-jobs-image.sh b/build/run-build-docker-jobs-image.sh
index 37c151c3404a460b6c4c3ae771fc789e81f4e0f0..15f788163ed604ea4592daae668c3dbe9e888923 100755 (executable)
--- a/build/run-build-docker-jobs-image.sh
+++ b/build/run-build-docker-jobs-image.sh
@@ -125,7 +125,11 @@ rm -f config.yml
 # Get test config.yml file
 cp $HOME/docker/config.yml .
 
-./build.sh jobs-image
+if [[ ! -z "$tags" ]]; then
+  COMMIT=${tags/,*/} ./build.sh jobs-image
+else
+  ./build.sh jobs-image
+fi
 
 ECODE=$?
 

diff --git a/docker/build_tools/Makefile b/docker/build_tools/Makefile
index 75702960133b3be2555b851babb9d5bf92e4c9a3..8a757d014e6f73919f3f74e8c5eef40faea20585 100644 (file)
--- a/docker/build_tools/Makefile
+++ b/docker/build_tools/Makefile
@@ -217,7 +217,7 @@ keep-proxy-image: debian-arvados-image $(BUILD) $(KEEP_PROXY_DEPS)
        date >keep-proxy-image
 
 jobs-image: debian-arvados-image $(BUILD) $(JOBS_DEPS)
-       $(DOCKER_BUILD) -t arvados/jobs jobs
+       $(DOCKER_BUILD) --build-arg COMMIT=$(COMMIT) -t arvados/jobs jobs
        date >jobs-image
 
 java-bwa-samtools-image: jobs-image $(BUILD) $(JAVA_BWA_SAMTOOLS_DEPS)

diff --git a/docker/jobs/Dockerfile b/docker/jobs/Dockerfile
index 0d7295873f723e637cf76413e01c16c6a2be5d95..30c2416e99511b2f1919591671296d7d13a659a3 100644 (file)
--- a/docker/jobs/Dockerfile
+++ b/docker/jobs/Dockerfile
@@ -6,14 +6,14 @@ ENV DEBIAN_FRONTEND noninteractive
 
 ADD apt.arvados.org.list /etc/apt/sources.list.d/
 RUN apt-key adv --keyserver pool.sks-keyservers.net --recv 1078ECD7
-RUN apt-get update -q
+RUN gpg --keyserver pool.sks-keyservers.net --recv-keys D39DC0E3
 
-RUN apt-get install -qy git python-pip python-virtualenv python-arvados-python-client python-dev libcurl4-gnutls-dev
+ARG COMMIT=latest
+RUN echo $COMMIT && apt-get update -q
 
-RUN gpg --keyserver pool.sks-keyservers.net --recv-keys D39DC0E3
+RUN apt-get install -qy git python-pip python-virtualenv python-arvados-python-client python-dev libcurl4-gnutls-dev
 
 # Install dependencies and set up system.
-# The FUSE packages help ensure that we can install the Python SDK (arv-mount).
 RUN /usr/sbin/adduser --disabled-password \
       --gecos 'Crunch execution user' crunch && \
     /usr/bin/install --directory --owner=crunch --group=crunch --mode=0700 /keep /tmp/crunch-src /tmp/crunch-job