Commit 93e59078 authored by Christian Rohlfing's avatar Christian Rohlfing
Browse files

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

parents 842db2aa 6f419d90
Pipeline #282689 failed with stage
in 7 minutes and 35 seconds
...@@ -4,69 +4,31 @@ services: ...@@ -4,69 +4,31 @@ services:
stages: stages:
- build - build
- test
- release
variables: variables:
GIT_SUBMODULE_STRATEGY: recursive 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" DOCKER_TLS_CERTDIR: "/certs"
CONTAINER_TEST_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG DOCKER_HOST: tcp://docker:2376 # Use TLS https://docs.gitlab.com/ee/ci/docker/using_docker_build.html#tls-enabled
CONTAINER_RELEASE_IMAGE: $CI_REGISTRY_IMAGE:latest
before_script: before_script:
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - echo ${CI_REGISTRY}
- docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD} ${CI_REGISTRY}
build-docker: - echo ${CI_CE_REGISTRY}
stage: build - docker login -u ${CI_CE_REGISTRY_USER} -p ${CI_CE_REGISTRY_TOKEN} ${CI_CE_REGISTRY}
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
build-binder: build:
stage: build stage: build
script: script:
# Use Binder build API to trigger repo2docker to build image on GKE and OVH Binder Federation clusters - docker pull ${CI_REGISTRY_IMAGE}:latest || true
- ls - docker build --cache-from ${CI_REGISTRY_IMAGE}:latestci
- apk update && apk add curl --tag ${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_SLUG}
- chmod +x binder/trigger_binder.sh --tag ${CI_REGISTRY_IMAGE}:latest .
- binder/trigger_binder.sh https://mybinder.org/build/git/https%3A%2F%2Fgit.rwth-aachen.de%2FIENT%2Fgdet3-demos/master - docker push ${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_SLUG}
- binder/trigger_binder.sh https://gke.mybinder.org/build/git/https%3A%2F%2Fgit.rwth-aachen.de%2FIENT%2Fgdet3-demos/master - docker push ${CI_REGISTRY_IMAGE}:latest
- 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
only: only:
- master - master
only: only:
changes: changes:
- binder/* - binder/*
- Dockerfile - 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
name: gdet3lab name: iuelab
channels: channels:
- conda-forge - conda-forge
dependencies: dependencies:
...@@ -7,4 +7,4 @@ dependencies: ...@@ -7,4 +7,4 @@ dependencies:
- matplotlib-base==3.1.2 - matplotlib-base==3.1.2
- jupyterlab==2.0.1 - jupyterlab==2.0.1
- nodejs==13.13.0 - nodejs==13.13.0
- ipympl==0.5.6 - ipympl==0.5.6
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment