Commit d07e6c0f authored by Leo Pound Singer's avatar Leo Pound Singer

Fix docker image tags for branches with slashes in their name [ci skip]

parent efde0e23
...@@ -63,7 +63,7 @@ bdist: ...@@ -63,7 +63,7 @@ bdist:
stage: dist stage: dist
variables: variables:
GIT_STRATEGY: fetch GIT_STRATEGY: fetch
IMAGE_TAG: $CI_REGISTRY_IMAGE/$CI_JOB_NAME:$CI_COMMIT_REF_NAME IMAGE_TAG: $CI_REGISTRY_IMAGE/$CI_JOB_NAME:$CI_COMMIT_REF_SLUG
script: script:
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
- | - |
...@@ -102,14 +102,14 @@ dependencies/python3.8: ...@@ -102,14 +102,14 @@ dependencies/python3.8:
reports: reports:
junit: junit.xml junit: junit.xml
test/python3.7: test/python3.7:
image: $CI_REGISTRY_IMAGE/dependencies/python3.7:$CI_COMMIT_REF_NAME image: $CI_REGISTRY_IMAGE/dependencies/python3.7:$CI_COMMIT_REF_SLUG
<<: *test <<: *test
test/python3.8: test/python3.8:
image: $CI_REGISTRY_IMAGE/dependencies/python3.8:$CI_COMMIT_REF_NAME image: $CI_REGISTRY_IMAGE/dependencies/python3.8:$CI_COMMIT_REF_SLUG
<<: *test <<: *test
lint: lint:
image: $CI_REGISTRY_IMAGE/dependencies/python3.8:$CI_COMMIT_REF_NAME image: $CI_REGISTRY_IMAGE/dependencies/python3.8:$CI_COMMIT_REF_SLUG
stage: test stage: test
variables: variables:
GIT_STRATEGY: fetch GIT_STRATEGY: fetch
...@@ -137,11 +137,11 @@ associate commits in Sentry: ...@@ -137,11 +137,11 @@ associate commits in Sentry:
.docker: &docker .docker: &docker
stage: deploy stage: deploy
script: script:
- IMAGE_TAG=$CI_REGISTRY_IMAGE/${CI_JOB_NAME#*/}:$CI_COMMIT_REF_NAME - IMAGE_TAG=$CI_REGISTRY_IMAGE/${CI_JOB_NAME#*/}:$CI_COMMIT_REF_SLUG
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
- | - |
cat <<EOF > Dockerfile cat <<EOF > Dockerfile
FROM $CI_REGISTRY_IMAGE/dependencies/${CI_JOB_NAME#*/}:$CI_COMMIT_REF_NAME FROM $CI_REGISTRY_IMAGE/dependencies/${CI_JOB_NAME#*/}:$CI_COMMIT_REF_SLUG
COPY *.whl . COPY *.whl .
RUN pip install *.whl RUN pip install *.whl
RUN rm -f *.whl RUN rm -f *.whl
......
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