From 081fb0fcb1d5e93ad3a22ea14ed2395e6a2613fb Mon Sep 17 00:00:00 2001
From: Moritz Maxeiner <mm@ucw.sh>
Date: Thu, 4 Jun 2020 03:32:20 +0200
Subject: [PATCH] Only reflect OS version in image tag
---
.gitlab-ci.yml | 50 +++++++++----------
{centos-7 => centos}/Dockerfile | 0
.../agki-nas01.imp.fu-berlin.de-ca-cert.crt | 0
{centos-7 => centos}/bash/ld-library-path.sh | 0
{centos-7 => centos}/bash/pylon.sh | 0
{centos-7 => centos}/bash/toolchain.sh | 0
.../mxnet-1.6.0-manual-cuda-arch-flags.patch | 0
{centos-7 => centos}/qtifwsilent.qs | 0
{ubuntu-18.04 => ubuntu}/Dockerfile | 0
.../agki-nas01.imp.fu-berlin.de-ca-cert.crt | 0
{windows-1809 => windows}/.gitignore | 0
{windows-1809 => windows}/base/Dockerfile | 0
.../base/powershell/00-Must-Run.ps1 | 0
.../base/powershell/10-VSDevEnv.ps1 | 0
.../base/powershell/20-MSVC-15.9.ps1 | 0
.../base/powershell/30-Vcpkg-CMake.ps1 | 0
.../base/powershell/Profile.ps1 | 0
{windows-1809 => windows}/base/qtifwsilent.qs | 0
.../cuda-devel/Dockerfile | 2 +-
{windows-1809 => windows}/devel/Dockerfile | 2 +-
20 files changed, 27 insertions(+), 27 deletions(-)
rename {centos-7 => centos}/Dockerfile (100%)
rename {centos-7 => centos}/agki-nas01.imp.fu-berlin.de-ca-cert.crt (100%)
rename {centos-7 => centos}/bash/ld-library-path.sh (100%)
rename {centos-7 => centos}/bash/pylon.sh (100%)
rename {centos-7 => centos}/bash/toolchain.sh (100%)
rename {centos-7 => centos}/patches/mxnet-1.6.0-manual-cuda-arch-flags.patch (100%)
rename {centos-7 => centos}/qtifwsilent.qs (100%)
rename {ubuntu-18.04 => ubuntu}/Dockerfile (100%)
rename {ubuntu-18.04 => ubuntu}/agki-nas01.imp.fu-berlin.de-ca-cert.crt (100%)
rename {windows-1809 => windows}/.gitignore (100%)
rename {windows-1809 => windows}/base/Dockerfile (100%)
rename {windows-1809 => windows}/base/powershell/00-Must-Run.ps1 (100%)
rename {windows-1809 => windows}/base/powershell/10-VSDevEnv.ps1 (100%)
rename {windows-1809 => windows}/base/powershell/20-MSVC-15.9.ps1 (100%)
rename {windows-1809 => windows}/base/powershell/30-Vcpkg-CMake.ps1 (100%)
rename {windows-1809 => windows}/base/powershell/Profile.ps1 (100%)
rename {windows-1809 => windows}/base/qtifwsilent.qs (100%)
rename {windows-1809 => windows}/cuda-devel/Dockerfile (99%)
rename {windows-1809 => windows}/devel/Dockerfile (98%)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fbaea44..1bfa930 100644
--- a/.gitlab-ci.yml
+++ b/.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}"
diff --git a/centos-7/Dockerfile b/centos/Dockerfile
similarity index 100%
rename from centos-7/Dockerfile
rename to centos/Dockerfile
diff --git a/centos-7/agki-nas01.imp.fu-berlin.de-ca-cert.crt b/centos/agki-nas01.imp.fu-berlin.de-ca-cert.crt
similarity index 100%
rename from centos-7/agki-nas01.imp.fu-berlin.de-ca-cert.crt
rename to centos/agki-nas01.imp.fu-berlin.de-ca-cert.crt
diff --git a/centos-7/bash/ld-library-path.sh b/centos/bash/ld-library-path.sh
similarity index 100%
rename from centos-7/bash/ld-library-path.sh
rename to centos/bash/ld-library-path.sh
diff --git a/centos-7/bash/pylon.sh b/centos/bash/pylon.sh
similarity index 100%
rename from centos-7/bash/pylon.sh
rename to centos/bash/pylon.sh
diff --git a/centos-7/bash/toolchain.sh b/centos/bash/toolchain.sh
similarity index 100%
rename from centos-7/bash/toolchain.sh
rename to centos/bash/toolchain.sh
diff --git a/centos-7/patches/mxnet-1.6.0-manual-cuda-arch-flags.patch b/centos/patches/mxnet-1.6.0-manual-cuda-arch-flags.patch
similarity index 100%
rename from centos-7/patches/mxnet-1.6.0-manual-cuda-arch-flags.patch
rename to centos/patches/mxnet-1.6.0-manual-cuda-arch-flags.patch
diff --git a/centos-7/qtifwsilent.qs b/centos/qtifwsilent.qs
similarity index 100%
rename from centos-7/qtifwsilent.qs
rename to centos/qtifwsilent.qs
diff --git a/ubuntu-18.04/Dockerfile b/ubuntu/Dockerfile
similarity index 100%
rename from ubuntu-18.04/Dockerfile
rename to ubuntu/Dockerfile
diff --git a/ubuntu-18.04/agki-nas01.imp.fu-berlin.de-ca-cert.crt b/ubuntu/agki-nas01.imp.fu-berlin.de-ca-cert.crt
similarity index 100%
rename from ubuntu-18.04/agki-nas01.imp.fu-berlin.de-ca-cert.crt
rename to ubuntu/agki-nas01.imp.fu-berlin.de-ca-cert.crt
diff --git a/windows-1809/.gitignore b/windows/.gitignore
similarity index 100%
rename from windows-1809/.gitignore
rename to windows/.gitignore
diff --git a/windows-1809/base/Dockerfile b/windows/base/Dockerfile
similarity index 100%
rename from windows-1809/base/Dockerfile
rename to windows/base/Dockerfile
diff --git a/windows-1809/base/powershell/00-Must-Run.ps1 b/windows/base/powershell/00-Must-Run.ps1
similarity index 100%
rename from windows-1809/base/powershell/00-Must-Run.ps1
rename to windows/base/powershell/00-Must-Run.ps1
diff --git a/windows-1809/base/powershell/10-VSDevEnv.ps1 b/windows/base/powershell/10-VSDevEnv.ps1
similarity index 100%
rename from windows-1809/base/powershell/10-VSDevEnv.ps1
rename to windows/base/powershell/10-VSDevEnv.ps1
diff --git a/windows-1809/base/powershell/20-MSVC-15.9.ps1 b/windows/base/powershell/20-MSVC-15.9.ps1
similarity index 100%
rename from windows-1809/base/powershell/20-MSVC-15.9.ps1
rename to windows/base/powershell/20-MSVC-15.9.ps1
diff --git a/windows-1809/base/powershell/30-Vcpkg-CMake.ps1 b/windows/base/powershell/30-Vcpkg-CMake.ps1
similarity index 100%
rename from windows-1809/base/powershell/30-Vcpkg-CMake.ps1
rename to windows/base/powershell/30-Vcpkg-CMake.ps1
diff --git a/windows-1809/base/powershell/Profile.ps1 b/windows/base/powershell/Profile.ps1
similarity index 100%
rename from windows-1809/base/powershell/Profile.ps1
rename to windows/base/powershell/Profile.ps1
diff --git a/windows-1809/base/qtifwsilent.qs b/windows/base/qtifwsilent.qs
similarity index 100%
rename from windows-1809/base/qtifwsilent.qs
rename to windows/base/qtifwsilent.qs
diff --git a/windows-1809/cuda-devel/Dockerfile b/windows/cuda-devel/Dockerfile
similarity index 99%
rename from windows-1809/cuda-devel/Dockerfile
rename to windows/cuda-devel/Dockerfile
index db103f1..360cf18 100644
--- a/windows-1809/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-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>"
diff --git a/windows-1809/devel/Dockerfile b/windows/devel/Dockerfile
similarity index 98%
rename from windows-1809/devel/Dockerfile
rename to windows/devel/Dockerfile
index 08992b4..48a8b57 100644
--- a/windows-1809/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-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>"
--
GitLab