Only reflect OS version in image tag

.gitlab-ci.yml

@@ -2,7 +2,7 @@ stages:
   - build
   - deploy
 
-build centos-7:
+build centos:
     stage: build
     tags: [ linux, shell ]
     before_script:
@@ -12,14 +12,14 @@ build centos-7:
       - CACHE_FILE="/var/lib/gitlab-runner/.local/share/robofish-docker-gpu-driver-version"
       - if [[ -f $CACHE_FILE ]] && [[ "$(cat $CACHE_FILE)" == "$GPU_DRIVER_VERSION" ]]; then OPTS=''; else OPTS='--no-cache'; fi
       - echo -n $GPU_DRIVER_VERSION > $CACHE_FILE
-      - docker build $OPTS --pull -t "${CI_REGISTRY}/${CI_PROJECT_PATH,,}:centos-7" -f centos-7/Dockerfile centos-7
-      - docker tag "${CI_REGISTRY}/${CI_PROJECT_PATH,,}:centos-7" "${CI_REGISTRY}/${CI_PROJECT_PATH,,}:centos"
-      - docker push "${CI_REGISTRY}/${CI_PROJECT_PATH,,}:centos-7"
+      - docker build $OPTS --pull -t "${CI_REGISTRY}/${CI_PROJECT_PATH,,}:centos" -f centos/Dockerfile centos
       - docker push "${CI_REGISTRY}/${CI_PROJECT_PATH,,}:centos"
+      - docker tag "${CI_REGISTRY}/${CI_PROJECT_PATH,,}:centos" "${CI_REGISTRY}/${CI_PROJECT_PATH,,}:centos-7"
+      - docker push "${CI_REGISTRY}/${CI_PROJECT_PATH,,}:centos-7"
     after_script:
       - docker logout "${CI_REGISTRY}"
 
-build ubuntu-18.04:
+build ubuntu:
   stage: build
   tags: [ linux, shell ]
   before_script:
@@ -29,39 +29,39 @@ build ubuntu-18.04:
     - CACHE_FILE="/var/lib/gitlab-runner/.local/share/robofish-docker-gpu-driver-version"
     - if [[ -f $CACHE_FILE ]] && [[ "$(cat $CACHE_FILE)" == "$GPU_DRIVER_VERSION" ]]; then OPTS=''; else OPTS='--no-cache'; fi
     - echo -n $GPU_DRIVER_VERSION > $CACHE_FILE
-    - docker build $OPTS --pull -t "${CI_REGISTRY}/${CI_PROJECT_PATH,,}:ubuntu-18.04" -f ubuntu-18.04/Dockerfile ubuntu-18.04
-    - docker tag "${CI_REGISTRY}/${CI_PROJECT_PATH,,}:ubuntu-18.04" "${CI_REGISTRY}/${CI_PROJECT_PATH,,}:ubuntu"
-    - docker push "${CI_REGISTRY}/${CI_PROJECT_PATH,,}:ubuntu-18.04"
+    - docker build $OPTS --pull -t "${CI_REGISTRY}/${CI_PROJECT_PATH,,}:ubuntu" -f ubuntu/Dockerfile ubuntu
     - docker push "${CI_REGISTRY}/${CI_PROJECT_PATH,,}:ubuntu"
+    - docker tag "${CI_REGISTRY}/${CI_PROJECT_PATH,,}:ubuntu" "${CI_REGISTRY}/${CI_PROJECT_PATH,,}:ubuntu-18.04"
+    - docker push "${CI_REGISTRY}/${CI_PROJECT_PATH,,}:ubuntu-18.04"
   after_script:
     - docker logout "${CI_REGISTRY}"
 
-build windows-1809:
+build windows:
   stage: build
   tags: [ windows-1809, shell ]
   before_script:
     - echo "${CI_REGISTRY_PASSWORD}" | docker login -u "${CI_REGISTRY_USER}" "${CI_REGISTRY}" --password-stdin
-    - Copy-Item 'C:/Windows/System32/opengl32.dll' 'windows-1809/devel/opengl32.dll'
-    - Copy-Item 'C:/Windows/System32/glu32.dll' 'windows-1809/devel/glu32.dll'
-    - Copy-Item 'C:/Windows/System32/ddraw.dll' 'windows-1809/devel/ddraw.dll'
-    - Copy-Item 'C:/Windows/System32/opengl32.dll' 'windows-1809/cuda-devel/opengl32.dll'
-    - Copy-Item 'C:/Windows/System32/glu32.dll' 'windows-1809/cuda-devel/glu32.dll'
-    - Copy-Item 'C:/Windows/System32/ddraw.dll' 'windows-1809/cuda-devel/ddraw.dll'
-    - Copy-Item 'C:/Windows/System32/nvcuda.dll' 'windows-1809/cuda-devel/nvcuda.dll'
+    - Copy-Item 'C:/Windows/System32/opengl32.dll' 'windows/devel/opengl32.dll'
+    - Copy-Item 'C:/Windows/System32/glu32.dll' 'windows/devel/glu32.dll'
+    - Copy-Item 'C:/Windows/System32/ddraw.dll' 'windows/devel/ddraw.dll'
+    - Copy-Item 'C:/Windows/System32/opengl32.dll' 'windows/cuda-devel/opengl32.dll'
+    - Copy-Item 'C:/Windows/System32/glu32.dll' 'windows/cuda-devel/glu32.dll'
+    - Copy-Item 'C:/Windows/System32/ddraw.dll' 'windows/cuda-devel/ddraw.dll'
+    - Copy-Item 'C:/Windows/System32/nvcuda.dll' 'windows/cuda-devel/nvcuda.dll'
   script:
     - $image_name = "${CI_REGISTRY}/$(${CI_PROJECT_PATH}.toLower())"
-    - docker build --memory 10G -t "${image_name}:base-windows-1809" windows-1809/base
-    - docker tag "${image_name}:base-windows-1809" "${image_name}:base-windows"
-    - docker push "${image_name}:base-windows-1809"
+    - docker build --memory 10G -t "${image_name}:base-windows" windows/base
     - docker push "${image_name}:base-windows"
-    - docker build --memory 15G -t "${image_name}:devel-windows-1809" -f windows-1809/devel/Dockerfile windows-1809/devel
-    - docker tag "${image_name}:devel-windows-1809" "${image_name}:devel-windows"
-    - docker push "${image_name}:devel-windows-1809"
+    - docker tag "${image_name}:base-windows" "${image_name}:base-windows-1809"
+    - docker push "${image_name}:base-windows-1809"
+    - docker build --memory 15G -t "${image_name}:devel-windows" -f windows/devel/Dockerfile windows/devel
     - docker push "${image_name}:devel-windows"
-    - docker build --memory 15G -t "${image_name}:cuda-devel-windows-1809" -f windows-1809/cuda-devel/Dockerfile windows-1809/cuda-devel
-    - docker tag "${image_name}:cuda-devel-windows-1809" "${image_name}:cuda-devel-windows"
-    - docker push "${image_name}:cuda-devel-windows-1809"
+    - docker tag "${image_name}:devel-windows" "${image_name}:devel-windows-1809"
+    - docker push "${image_name}:devel-windows-1809"
+    - docker build --memory 15G -t "${image_name}:cuda-devel-windows" -f windows/cuda-devel/Dockerfile windows/cuda-devel
     - docker push "${image_name}:cuda-devel-windows"
+    - docker tag "${image_name}:cuda-devel-windows" "${image_name}:cuda-devel-windows-1809"
+    - docker push "${image_name}:cuda-devel-windows-1809"
   after_script:
     - docker logout "${CI_REGISTRY}"
 

windows-1809/cuda-devel/Dockerfile → windows/cuda-devel/Dockerfile

 # SPDX-License-Identifier: AGPL-3.0-or-later
-FROM git.imp.fu-berlin.de:5000/bioroboticslab/robofish/docker:base-windows-1809
+FROM git.imp.fu-berlin.de:5000/bioroboticslab/robofish/docker:base-windows
 
 LABEL maintainer="Moritz Maxeiner <moritz.maxeiner@fu-berlin.de>"
 LABEL authors="Moritz Maxeiner <moritz.maxeiner@fu-berlin.de>"

windows-1809/devel/Dockerfile → windows/devel/Dockerfile

 # SPDX-License-Identifier: AGPL-3.0-or-later
-FROM git.imp.fu-berlin.de:5000/bioroboticslab/robofish/docker:base-windows-1809
+FROM git.imp.fu-berlin.de:5000/bioroboticslab/robofish/docker:base-windows
 
 LABEL maintainer="Moritz Maxeiner <moritz.maxeiner@fu-berlin.de>"
 LABEL authors="Moritz Maxeiner <moritz.maxeiner@fu-berlin.de>"