diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6af8abe8b0dfafeef903a44038db40754325b954..0ffbbd6f6d7aa6693ae41c54301bcbedd25b0581 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -71,8 +71,8 @@ stages: build main: extends: .build script: - - docker pull ${CI_REGISTRY_IMAGE}/${IMAGE_NAME}:${DOCKER_TAG} || docker pull ${CI_REGISTRY_IMAGE}/${IMAGE_NAME} || true - - docker tag ${CI_REGISTRY_IMAGE}/${IMAGE_NAME} ${CI_REGISTRY_IMAGE}/${IMAGE_NAME}:${DOCKER_TAG} || true + - docker pull ${CI_REGISTRY_IMAGE}/${IMAGE_NAME}:${DOCKER_TAG} || docker pull ${CI_REGISTRY_IMAGE}/${IMAGE_NAME}:develop || true + - docker tag ${CI_REGISTRY_IMAGE}/${IMAGE_NAME}:develop ${CI_REGISTRY_IMAGE}/${IMAGE_NAME}:${DOCKER_TAG} || true - docker build -t ${CI_REGISTRY_IMAGE}/${IMAGE_NAME}:${DOCKER_TAG} . - docker push ${CI_REGISTRY_IMAGE}/${IMAGE_NAME}:${DOCKER_TAG} timeout: 2h @@ -87,8 +87,8 @@ build main: build dockerfile: extends: .build script: - - docker pull ${CI_REGISTRY_IMAGE}/${IMAGE_NAME}:${DOCKER_TAG} || docker pull ${CI_REGISTRY_IMAGE}/${IMAGE_NAME} || true - - docker tag ${CI_REGISTRY_IMAGE}/${IMAGE_NAME} ${CI_REGISTRY_IMAGE}/${IMAGE_NAME}:${DOCKER_TAG} || true + - docker pull ${CI_REGISTRY_IMAGE}/${IMAGE_NAME}:${DOCKER_TAG} || docker pull ${CI_REGISTRY_IMAGE}/${IMAGE_NAME}:develop || true + - docker tag ${CI_REGISTRY_IMAGE}/${IMAGE_NAME}:develop ${CI_REGISTRY_IMAGE}/${IMAGE_NAME}:${DOCKER_TAG} || true - docker build -t ${CI_REGISTRY_IMAGE}/${IMAGE_NAME}:${DOCKER_TAG} -f ${DOCKERFILE} . - docker push ${CI_REGISTRY_IMAGE}/${IMAGE_NAME}:${DOCKER_TAG} resource_group: build_containers diff --git a/docker/mpes/example/E1 Convert to NeXus.ipynb b/docker/mpes/example/E1 Convert to NeXus.ipynb index 8333c51c17043806a09ba43d8347d02692b7d9eb..9c9057ff831b031592405a454591e731e12aaf6a 100644 --- a/docker/mpes/example/E1 Convert to NeXus.ipynb +++ b/docker/mpes/example/E1 Convert to NeXus.ipynb @@ -30,7 +30,9 @@ { "cell_type": "code", "execution_count": null, - "metadata": {}, + "metadata": { + "tags": ["skip-execution"] + }, "outputs": [], "source": [ "! curl -o MoTe2.h5 \"https://zenodo.org/record/7573825/files/MoTe2.h5?download=1\"" @@ -143,7 +145,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.10.8" + "version": "3.8.13" }, "vscode": { "interpreter": {