From af3f70c3625dfafae9a6056c918a45662157fbeb Mon Sep 17 00:00:00 2001
From: Moritz Maxeiner <mm@ucw.sh>
Date: Thu, 6 Dec 2018 17:09:47 +0100
Subject: [PATCH] ubuntu18.04: Refactor
---
.gitlab-ci.yml | 6 +++---
ubuntu18.04/{ => cuda-devel}/Dockerfile | 0
2 files changed, 3 insertions(+), 3 deletions(-)
rename ubuntu18.04/{ => cuda-devel}/Dockerfile (100%)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b0033b2..4aa98e6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,11 +9,11 @@ build ubuntu-18.04:
- echo "${CI_REGISTRY_PASSWORD}" | docker login -u "${CI_REGISTRY_USER}" "${CI_REGISTRY}" --password-stdin
script:
- GPU_DRIVER_VERSION="$(dpkg-query --showformat='${Version}' --show 'nvidia-driver-*')"
- - CACHE_FILE="/var/lib/gitlab-runner/.local/share/rf_docker-gpu-driver-version"
+ - 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" ubuntu-18.04
- - docker push "${CI_REGISTRY}/${CI_PROJECT_PATH,,}:ubuntu-18.04"
+ - docker build $OPTS --pull -t "${CI_REGISTRY}/${CI_PROJECT_PATH,,}:cuda-devel-ubuntu18.04" -f ubuntu18.04/cuda-devel/Dockerfile ubuntu18.04
+ - docker push "${CI_REGISTRY}/${CI_PROJECT_PATH,,}:cuda-devel-ubuntu18.04"
after_script:
- docker logout "${CI_REGISTRY}"
diff --git a/ubuntu18.04/Dockerfile b/ubuntu18.04/cuda-devel/Dockerfile
similarity index 100%
rename from ubuntu18.04/Dockerfile
rename to ubuntu18.04/cuda-devel/Dockerfile
--
GitLab