mirror of
https://gitlab.com/veloren/veloren.git
synced 2024-08-30 18:12:32 +00:00
Seems like before_script in publish was overwriting cargo on pages job, so i just move it into the script itself
This commit is contained in:
parent
731fd1021d
commit
0941dfffae
@ -6,8 +6,6 @@
|
||||
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
|
||||
when: on_success
|
||||
- when: never
|
||||
before_script:
|
||||
- source "$CI_PROJECT_DIR/.gitlab/scripts/util.sh"
|
||||
|
||||
docker:
|
||||
extends: .publish
|
||||
@ -25,6 +23,7 @@ docker:
|
||||
- export container=docker
|
||||
- echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
|
||||
- |
|
||||
source "$CI_PROJECT_DIR/.gitlab/scripts/util.sh"
|
||||
publishdockertag PUBLISH_DOCKER_TAG
|
||||
if [ "${PUBLISH_DOCKER_TAG}" != "" ]; then
|
||||
/kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/server-cli/Dockerfile --destination "${CI_REGISTRY_IMAGE}/server-cli:${PUBLISH_DOCKER_TAG}"
|
||||
|
Loading…
Reference in New Issue
Block a user