mirror of
https://gitlab.com/veloren/veloren.git
synced 2024-08-30 18:12:32 +00:00
use different docker tags for master and nightly runs,
This allow us to decouple our test-ci from the release-ci and is necessary for multiple release channels in the future. E.g. we can run a master build without it directly beeing pushed to watchtower and airshipper (config setting requiered on airshipper) Adjust Tags for server-cli
This commit is contained in:
parent
8d664ded1a
commit
ea16fa10ab
@ -5,7 +5,16 @@
|
|||||||
tags:
|
tags:
|
||||||
- veloren-docker
|
- veloren-docker
|
||||||
rules:
|
rules:
|
||||||
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE == "schedule"
|
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE != "schedule"
|
||||||
|
when: always
|
||||||
|
- when: never
|
||||||
|
|
||||||
|
.publish-nightly:
|
||||||
|
stage: publish
|
||||||
|
tags:
|
||||||
|
- veloren-docker
|
||||||
|
rules:
|
||||||
|
- if: $CI_PIPELINE_SOURCE == "schedule" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
|
||||||
when: always
|
when: always
|
||||||
- when: never
|
- when: never
|
||||||
|
|
||||||
@ -20,7 +29,20 @@ docker:
|
|||||||
- ls "$CI_PROJECT_DIR/server-cli/"
|
- ls "$CI_PROJECT_DIR/server-cli/"
|
||||||
script:
|
script:
|
||||||
- echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
|
- echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
|
||||||
- /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/server-cli/Dockerfile --destination "${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_NAME}-server"
|
- /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/server-cli/Dockerfile --destination "${CI_REGISTRY_IMAGE}/server-cli:${CI_COMMIT_REF_NAME}"
|
||||||
|
|
||||||
|
docker-nightly:
|
||||||
|
extends: .publish-nightly
|
||||||
|
image:
|
||||||
|
name: gcr.io/kaniko-project/executor:debug
|
||||||
|
entrypoint: [""]
|
||||||
|
dependencies:
|
||||||
|
- linux
|
||||||
|
before_script:
|
||||||
|
- ls "$CI_PROJECT_DIR/server-cli/"
|
||||||
|
script:
|
||||||
|
- echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
|
||||||
|
- /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/server-cli/Dockerfile --destination "${CI_REGISTRY_IMAGE}/server-cli:nightly"
|
||||||
|
|
||||||
pages:
|
pages:
|
||||||
extends: .publish
|
extends: .publish
|
||||||
|
@ -9,12 +9,12 @@
|
|||||||
- when: manual
|
- when: manual
|
||||||
allow_failure: true
|
allow_failure: true
|
||||||
|
|
||||||
# Template to only run if pushes to master or a tag happened and it being triggered by a schedule
|
# Template to only run if pushes to master or a tag happened
|
||||||
.release:
|
.release:
|
||||||
stage: build
|
stage: build
|
||||||
tags:
|
tags:
|
||||||
- veloren-docker
|
- veloren-docker
|
||||||
rules:
|
rules:
|
||||||
- if: $CI_PIPELINE_SOURCE == "schedule" && ( $CI_COMMIT_REF_NAME =~ /^master$/ || $CI_COMMIT_TAG =~ /^v[0-9]+\.[0-9]+\.[0-9]+/ || $CI_COMMIT_REF_NAME =~ /^r[0-9]+\.[0-9]+/ )
|
- if: $CI_COMMIT_REF_NAME =~ /^master$/ || $CI_COMMIT_TAG =~ /^v[0-9]+\.[0-9]+\.[0-9]+/ || $CI_COMMIT_REF_NAME =~ /^r[0-9]+\.[0-9]+/
|
||||||
when: always
|
when: always
|
||||||
- when: never
|
- when: never
|
@ -2,7 +2,7 @@ version: "3.5"
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
game-server:
|
game-server:
|
||||||
image: registry.gitlab.com/veloren/veloren:master-server
|
image: registry.gitlab.com/veloren/veloren/server-cli:nightly
|
||||||
container_name: veloren-game-server-master
|
container_name: veloren-game-server-master
|
||||||
ports:
|
ports:
|
||||||
- "14004:14004"
|
- "14004:14004"
|
||||||
|
Loading…
Reference in New Issue
Block a user