fix: the image is in cic-base-images

This commit is contained in:
semvervot 2021-10-18 17:52:24 -07:00
parent 078c2720f9
commit 2b4771d97a
2 changed files with 7 additions and 3 deletions

View File

@ -27,15 +27,14 @@ variables:
# - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY # - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
version: version:
image: python:3.7-stretch #image: python:3.7-stretch
image: registry.gitlab.com/grassrootseconomics/cic-base-images/ci-version:8b5874c3
stage: version stage: version
script: script:
- mkdir -p ~/.ssh && chmod 700 ~/.ssh - mkdir -p ~/.ssh && chmod 700 ~/.ssh
- ssh-keyscan gitlab.com >> ~/.ssh/known_hosts && chmod 644 ~/.ssh/known_hosts - ssh-keyscan gitlab.com >> ~/.ssh/known_hosts && chmod 644 ~/.ssh/known_hosts
- eval $(ssh-agent -s) - eval $(ssh-agent -s)
- ssh-add <(echo "$SSH_PRIVATE_KEY") - ssh-add <(echo "$SSH_PRIVATE_KEY")
- curl -o sbot -L https://github.com/restechnica/semverbot/releases/download/v$SEMVERBOT_VERSION/sbot-linux-amd64
- chmod +x sbot
- git remote set-url origin git@gitlab.com:grassrootseconomics/cic-internal-integration.git - git remote set-url origin git@gitlab.com:grassrootseconomics/cic-internal-integration.git
- export TAG=$(./sbot predict version -m auto) - export TAG=$(./sbot predict version -m auto)
- | - |
@ -53,6 +52,8 @@ version:
rules: rules:
- if: $CI_COMMIT_REF_PROTECTED == "true" - if: $CI_COMMIT_REF_PROTECTED == "true"
when: always when: always
- if: $CI_COMMIT_REF_NAME == "master"
when: always
# runs on protected branches and pushes to repo # runs on protected branches and pushes to repo
build-push: build-push:
@ -68,6 +69,8 @@ build-push:
rules: rules:
- if: $CI_COMMIT_REF_PROTECTED == "true" - if: $CI_COMMIT_REF_PROTECTED == "true"
when: always when: always
- if: $CI_COMMIT_REF_NAME == "master"
when: always
deploy-dev: deploy-dev:
stage: deploy stage: deploy

View File

@ -9,3 +9,4 @@ docker-compose \
build \ build \
--no-cache \ --no-cache \
--parallel \ --parallel \
--progress plain