A few fixes:

* our api and workbench packages now depend on arvados-server, handle
  that correctly in the rails Dockerfile, bootstrap.sh and the
  respective helm deployment charts.
* make the apt-get install call in bootstrap.sh a bit more resilient,
  allow downgrading.
* the Makefile commands that push the base docker images now only push
  the latest tag

No issue #

Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward@curii.com>

diff --git a/charts/arvados/templates/api-server-deployment.yaml b/charts/arvados/templates/api-server-deployment.yaml
index 4f90fcaeb5ec5026b60377c02d75665cbe0346d5..0b42ffadb84bb65a8e011b23fca92e41e76c7d59 100644 (file)
--- a/charts/arvados/templates/api-server-deployment.yaml
+++ b/charts/arvados/templates/api-server-deployment.yaml
@@ -29,7 +29,7 @@ spec:
           command:
             - "sh"
             - "-c"
-            - "install /init-scripts/*.sh /etc/my_init.d && /usr/local/bin/bootstrap.sh arvados-api-server={{ .Values.arvados.versions.distribution.arvadosApiServer }} && cd /var/www/arvados-api/current && exec /sbin/my_init"
+            - "install /init-scripts/*.sh /etc/my_init.d && /usr/local/bin/bootstrap.sh arvados-api-server={{ .Values.arvados.versions.distribution.arvadosApiServer }} arvados-server={{ .Values.arvados.versions.distribution.arvadosApiServer }} && cd /var/www/arvados-api/current && exec /sbin/my_init"
           env:
             - name: RAILS_ENV
               value: "production"

diff --git a/charts/arvados/templates/workbench-deployment.yaml b/charts/arvados/templates/workbench-deployment.yaml
index e8c506e451c2fdc97300ba4fdf4330facb9f1990..a6552a6bb2f99b2c3015eddfd7dc553fba0a739b 100644 (file)
--- a/charts/arvados/templates/workbench-deployment.yaml
+++ b/charts/arvados/templates/workbench-deployment.yaml
@@ -29,7 +29,7 @@ spec:
           command:
             - "sh"
             - "-c"
-            - "/usr/local/bin/bootstrap.sh arvados-workbench={{ .Values.arvados.versions.distribution.arvadosWorkbench }} arvados-workbench2={{ .Values.arvados.versions.distribution.arvadosWorkbench2 }} && exec /sbin/my_init"
+            - "/usr/local/bin/bootstrap.sh arvados-workbench={{ .Values.arvados.versions.distribution.arvadosWorkbench }} arvados-workbench2={{ .Values.arvados.versions.distribution.arvadosWorkbench2 }} arvados-server={{ .Values.arvados.versions.distribution.arvadosWorkbench2 }} && exec /sbin/my_init"
           env:
             - name: RAILS_ENV
               value: "production"

diff --git a/dockerfiles/Dockerfile.rails-runtime b/dockerfiles/Dockerfile.rails-runtime
index 011a1f54a811e24a8a626138ad25fb617094a384..90857ec34b06807f682af5112a6c7eb99aacc285 100644 (file)
--- a/dockerfiles/Dockerfile.rails-runtime
+++ b/dockerfiles/Dockerfile.rails-runtime
@@ -21,7 +21,7 @@ RUN apt-get update && apt-get install -qqy tzdata
 # baked into this docker image. Then remove them so that this image is generic.
 # The bundles will remain installed.
 RUN apt-get install -qqy arvados-workbench arvados-sso-server arvados-api-server
-RUN apt-get remove -qqy arvados-workbench arvados-sso-server arvados-api-server
+RUN apt-get remove -qqy arvados-workbench arvados-sso-server arvados-api-server arvados-server
 
 # put nginx.conf back into the state it needs to be
 RUN sed -i 's/#daemon off;/daemon off;/' /etc/nginx/nginx.conf

diff --git a/dockerfiles/Makefile b/dockerfiles/Makefile
index dc0c9d462c759ca7ad283e8265d76e6a5171e392..0870f6e0d4ca8617f30e3bb21e7e0f5d62cc7f1a 100644 (file)
--- a/dockerfiles/Makefile
+++ b/dockerfiles/Makefile
@@ -14,22 +14,22 @@ docker-build-arvados-runtime:
        docker build -t ${REPO}/arvados-runtime -f Dockerfile.runtime .
 
 docker-push-arvados-runtime: docker-build-arvados-runtime
-       docker push ${REPO}/arvados-runtime
+       docker push ${REPO}/arvados-runtime:latest
 
 docker-build-arvados-rails-runtime:
        docker build -t ${REPO}/arvados-rails-runtime -f Dockerfile.rails-runtime .
 
 docker-push-arvados-rails-runtime: docker-build-arvados-rails-runtime
-       docker push ${REPO}/arvados-rails-runtime
+       docker push ${REPO}/arvados-rails-runtime:latest
 
 docker-build-arvados-slurm-runtime:
        docker build -t ${REPO}/arvados-slurm-runtime -f Dockerfile.slurm-runtime .
 
 docker-push-arvados-slurm-runtime: docker-build-arvados-slurm-runtime
-       docker push ${REPO}/arvados-slurm-runtime
+       docker push ${REPO}/arvados-slurm-runtime:latest
 
 docker-build-arvados-shell-server-runtime:
        docker build -t ${REPO}/arvados-shell-server-runtime -f Dockerfile.shell_server-runtime .
 
 docker-push-arvados-shell-server-runtime: docker-build-arvados-shell-server-runtime
-       docker push ${REPO}/arvados-shell-server-runtime
+       docker push ${REPO}/arvados-shell-server-runtime:latest

diff --git a/dockerfiles/bootstrap.sh b/dockerfiles/bootstrap.sh
index c236b8027af42309a4521a4500ab7e949b575836..cfdc8c43792fb2ae34f728b02a7ce2a5bc4c0293 100755 (executable)
--- a/dockerfiles/bootstrap.sh
+++ b/dockerfiles/bootstrap.sh
@@ -33,11 +33,11 @@ if [[ "$RESET_NGINX_DAEMON_FLAG" == true ]]; then
 fi
 
 if [[ "$debs" != "" ]]; then
-  apt-get -qqy install $debs
+  apt-get -qqy --allow-downgrades install $debs
   if [[ "$?" != "0" ]]; then
     # Maybe we need to update the apt cache first?
     apt-get update
-    apt-get -qqy install $debs
+    apt-get -qqy --allow-downgrades install $debs
   fi
 fi