Bump Arvados to 2.2.0. Bump the rails-runtime image to Ubuntu 20.04

[arvados-k8s.git] / dockerfiles / Makefile

diff --git a/dockerfiles/Makefile b/dockerfiles/Makefile
index 0870f6e0d4ca8617f30e3bb21e7e0f5d62cc7f1a..cd24b4b7c1ff10da5090758d7b69898b5af1c8e4 100644 (file)
--- a/dockerfiles/Makefile
+++ b/dockerfiles/Makefile
@@ -3,33 +3,37 @@
 # SPDX-License-Identifier: AGPL-3.0
 
 REPO = cure
+REBUILD=
 
 all: build push
 
+rebuild: REBUILD="--no-cache"
+rebuild: build
+
 build: docker-build-arvados-runtime docker-build-arvados-rails-runtime docker-build-arvados-slurm-runtime docker-build-arvados-shell-server-runtime
 
 push: docker-push-arvados-runtime docker-push-arvados-rails-runtime docker-push-arvados-slurm-runtime docker-push-arvados-shell-server-runtime
 
 docker-build-arvados-runtime:
-       docker build -t ${REPO}/arvados-runtime -f Dockerfile.runtime .
+       docker build ${REBUILD} -t ${REPO}/arvados-runtime -f Dockerfile.runtime .
 
 docker-push-arvados-runtime: docker-build-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 build ${REBUILD} -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:latest
 
 docker-build-arvados-slurm-runtime:
-       docker build -t ${REPO}/arvados-slurm-runtime -f Dockerfile.slurm-runtime .
+       docker build ${REBUILD} -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:latest
 
 docker-build-arvados-shell-server-runtime:
-       docker build -t ${REPO}/arvados-shell-server-runtime -f Dockerfile.shell_server-runtime .
+       docker build ${REBUILD} -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:latest