Merge branch 'main' of gitlab.ilabt.imec.be:tlips/gpulab into main

.gitlab-ci.yml

@@ -9,8 +9,10 @@ stages:
 variables:
    DOCKER_HOST: tcp://docker:2375/
    DOCKER_DRIVER: overlay2
-   CONTAINER_JUPYTERLAB_PYTORCH_IMAGE: $CI_REGISTRY_IMAGE/gpulab-jupyterhub-dl:$CI_COMMIT_REF_SLUG
-   CONTAINER_JUPYTERLAB_PYTORCH_RELEASE_IMAGE: $CI_REGISTRY_IMAGE/gpulab-jupyterhub-dl:latest
+   CONTAINER_JUPYTERLAB_PYTORCH_IMAGE: $CI_REGISTRY_IMAGE/jupyterlab-pytorch:$CI_COMMIT_REF_SLUG
+   CONTAINER_JUPYTERLAB_PYTORCH_RELEASE_IMAGE: $CI_REGISTRY_IMAGE/jupyterlab-pytorch:latest
+   CONTAINER_BASE_DL_IMAGE: $CI_REGISTRY_IMAGE/base-dl:$CI_COMMIT_REF_SLUG
+   CONTAINER_BASE_DL_RELEASE_IMAGE: $CI_REGISTRY_IMAGE/base-dl:latest
 
 
 before_script:
@@ -24,8 +26,22 @@ build_gpulab-jupyterhub-dl:
     - docker build  --pull --cache-from $CONTAINER_JUPYTERLAB_PYTORCH_IMAGE --tag $CONTAINER_JUPYTERLAB_PYTORCH_IMAGE docker -f docker/gpulab-jupyterhub.Dockerfile
     - docker push $CONTAINER_JUPYTERLAB_PYTORCH_IMAGE
 
+build_base:
+  stage: build
+  script:
+    - docker pull $CONTAINER_BASE_DL_IMAGE || true
+    - docker build  --pull --cache-from $CONTAINER_BASE_DL_IMAGE --tag $CONTAINER_BASE_DL_IMAGE docker -f docker/base-dl.Dockerfile
+    - docker push $CONTAINER_BASE_DL_IMAGE
 
-release_gpulab-jupyterhub-dl:
+release_base_dl:
+  stage: release
+  script:
+    - docker pull $CONTAINER_BASE_DL_IMAGE
+    - docker tag $CONTAINER_BASE_DL_IMAGE $CONTAINER_BASE_DL_RELEASE_IMAGE
+    - docker push $CONTAINER_BASE_DL_RELEASE_IMAGE
+  only:
+    - main  
+release_pytorch:
   stage: release
   script:
     - docker pull $CONTAINER_JUPYTERLAB_PYTORCH_IMAGE