Merge remote-tracking branch 'origin/master' into development-lab-rwth_nb

.gitlab-ci.yml

@@ -4,69 +4,31 @@ services:
 
 stages:
   - build
-  - test
-  - release
 
 variables:
   GIT_SUBMODULE_STRATEGY: recursive
-  DOCKER_HOST: tcp://docker:2376 # Use TLS https://docs.gitlab.com/ee/ci/docker/using_docker_build.html#tls-enabled
   DOCKER_TLS_CERTDIR: "/certs"
-  CONTAINER_TEST_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
-  CONTAINER_RELEASE_IMAGE: $CI_REGISTRY_IMAGE:latest
+  DOCKER_HOST: tcp://docker:2376 # Use TLS https://docs.gitlab.com/ee/ci/docker/using_docker_build.html#tls-enabled
 
 before_script:
-  - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-
-build-docker:
-  stage: build
-  script:
-    - docker pull $CONTAINER_TEST_IMAGE || true
-    - docker build --cache-from $CONTAINER_TEST_IMAGE --tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA --tag $CONTAINER_TEST_IMAGE .
-    - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
-    - docker push $CONTAINER_TEST_IMAGE
-  only:
-    - master
-  only:
-    changes:
-      - binder/*
-      - Dockerfile
+  - echo ${CI_REGISTRY}
+  - docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD} ${CI_REGISTRY}
+  - echo ${CI_CE_REGISTRY}
+  - docker login -u ${CI_CE_REGISTRY_USER} -p ${CI_CE_REGISTRY_TOKEN} ${CI_CE_REGISTRY}
 
 
-build-binder:
+build:
   stage: build
   script:
-    # Use Binder build API to trigger repo2docker to build image on GKE and OVH Binder Federation clusters
-    - ls
-    - apk update && apk add curl
-    - chmod +x binder/trigger_binder.sh
-    - binder/trigger_binder.sh https://mybinder.org/build/git/https%3A%2F%2Fgit.rwth-aachen.de%2FIENT%2Fgdet3-demos/master
-    - binder/trigger_binder.sh https://gke.mybinder.org/build/git/https%3A%2F%2Fgit.rwth-aachen.de%2FIENT%2Fgdet3-demos/master
-    - binder/trigger_binder.sh https://ovh.mybinder.org/build/git/https%3A%2F%2Fgit.rwth-aachen.de%2FIENT%2Fgdet3-demos/master
-    - ls
-  only:
-    - master
-
-test-docker:
-  stage: test
-  script:
-    - docker pull $CONTAINER_TEST_IMAGE
+    - docker pull ${CI_REGISTRY_IMAGE}:latest || true
+    - docker build --cache-from ${CI_REGISTRY_IMAGE}:latestci
+                   --tag ${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_SLUG}
+                   --tag ${CI_REGISTRY_IMAGE}:latest .
+    - docker push ${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_SLUG}
+    - docker push ${CI_REGISTRY_IMAGE}:latest
   only:
     - master
   only:
     changes:
       - binder/*
       - Dockerfile
-
-
-release-docker:
-  stage: release
-  script:
-    - docker pull $CONTAINER_TEST_IMAGE
-    - docker tag $CONTAINER_TEST_IMAGE $CONTAINER_RELEASE_IMAGE
-    - docker push $CONTAINER_RELEASE_IMAGE
-  only:
-    - master
-  only:
-    changes:
-      - binder/*
-      - Dockerfile
\ No newline at end of file

binder/environment.yml

-name: gdet3lab
+name: iuelab
 channels:
   - conda-forge
 dependencies:
@@ -7,4 +7,4 @@ dependencies:
   - matplotlib-base==3.1.2
   - jupyterlab==2.0.1
   - nodejs==13.13.0
-  - ipympl==0.5.6
\ No newline at end of file
+  - ipympl==0.5.6