From ac5cafed67cde8a06cac9aaabfeec0f18b3cb16b Mon Sep 17 00:00:00 2001
From: Moritz Maxeiner <mm@ucw.sh>
Date: Fri, 5 Jun 2020 15:50:58 +0200
Subject: [PATCH] [windows,ci] use the current (i.e. just built) base image,
instead of a previous one
---
.gitlab-ci.yml | 1 +
windows/cuda-devel/Dockerfile | 2 +-
windows/devel/Dockerfile | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f6691d6..42bf822 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -63,6 +63,7 @@ build windows:
script:
- $image_name = "${CI_REGISTRY}/$(${CI_PROJECT_PATH}.toLower())"
- docker build --memory 10G -t "${image_name}:${CI_COMMIT_REF_NAME}-base-windows" windows/base
+ - docker tag "${image_name}:${CI_COMMIT_REF_NAME}-base-windows" "${image_name}:current-base-windows"
- docker build --memory 15G -t "${image_name}:${CI_COMMIT_REF_NAME}-devel-windows" -f windows/devel/Dockerfile windows/devel
- docker build --memory 15G -t "${image_name}:${CI_COMMIT_REF_NAME}-cuda-devel-windows" -f windows/cuda-devel/Dockerfile windows/cuda-devel
diff --git a/windows/cuda-devel/Dockerfile b/windows/cuda-devel/Dockerfile
index 360cf18..eddeb2a 100644
--- a/windows/cuda-devel/Dockerfile
+++ b/windows/cuda-devel/Dockerfile
@@ -1,5 +1,5 @@
# SPDX-License-Identifier: AGPL-3.0-or-later
-FROM git.imp.fu-berlin.de:5000/bioroboticslab/robofish/docker:base-windows
+FROM git.imp.fu-berlin.de:5000/bioroboticslab/robofish/docker:current-base-windows
LABEL maintainer="Moritz Maxeiner <moritz.maxeiner@fu-berlin.de>"
LABEL authors="Moritz Maxeiner <moritz.maxeiner@fu-berlin.de>"
diff --git a/windows/devel/Dockerfile b/windows/devel/Dockerfile
index 48a8b57..0721d9e 100644
--- a/windows/devel/Dockerfile
+++ b/windows/devel/Dockerfile
@@ -1,5 +1,5 @@
# SPDX-License-Identifier: AGPL-3.0-or-later
-FROM git.imp.fu-berlin.de:5000/bioroboticslab/robofish/docker:base-windows
+FROM git.imp.fu-berlin.de:5000/bioroboticslab/robofish/docker:current-base-windows
LABEL maintainer="Moritz Maxeiner <moritz.maxeiner@fu-berlin.de>"
LABEL authors="Moritz Maxeiner <moritz.maxeiner@fu-berlin.de>"
--
GitLab