Commit 22d46b75 authored by nanahira's avatar nanahira

fix arg

parent d683f5aa
Pipeline #637 failed with stages
in 2 minutes and 31 seconds
...@@ -6,6 +6,10 @@ variables: ...@@ -6,6 +6,10 @@ variables:
GIT_DEPTH: "1" GIT_DEPTH: "1"
# CONTAINER_TEST_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG # CONTAINER_TEST_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
# CONTAINER_RELEASE_IMAGE: $CI_REGISTRY_IMAGE:latest # CONTAINER_RELEASE_IMAGE: $CI_REGISTRY_IMAGE:latest
PANEL_VERSION: v0.7.18
DAEMON_VERSION: v0.6.13
SFTP_VERSION: v1.0.5
before_script: before_script:
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
...@@ -18,7 +22,7 @@ build_panel: ...@@ -18,7 +22,7 @@ build_panel:
CONTAINER_TEST_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-panel CONTAINER_TEST_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-panel
script: script:
- cd manifest/panel - cd manifest/panel
- docker build --pull -t $CONTAINER_TEST_IMAGE . - docker build --build-arg PANEL_VERSION=$PANEL_VERSION --pull -t $CONTAINER_TEST_IMAGE .
- docker push $CONTAINER_TEST_IMAGE - docker push $CONTAINER_TEST_IMAGE
build_daemon: build_daemon:
...@@ -29,7 +33,7 @@ build_daemon: ...@@ -29,7 +33,7 @@ build_daemon:
CONTAINER_TEST_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-daemon CONTAINER_TEST_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-daemon
script: script:
- cd manifest/daemon - cd manifest/daemon
- docker build --pull -t $CONTAINER_TEST_IMAGE . - docker build --build-arg DAEMON_VERSION=$DAEMON_VERSION --pull -t $CONTAINER_TEST_IMAGE .
- docker push $CONTAINER_TEST_IMAGE - docker push $CONTAINER_TEST_IMAGE
build_sftp: build_sftp:
...@@ -40,7 +44,7 @@ build_sftp: ...@@ -40,7 +44,7 @@ build_sftp:
CONTAINER_TEST_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-sftp CONTAINER_TEST_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-sftp
script: script:
- cd manifest/sftp - cd manifest/sftp
- docker build --pull -t $CONTAINER_TEST_IMAGE . - docker build --build-arg SFTP_VERSION=$SFTP_VERSION --pull -t $CONTAINER_TEST_IMAGE .
- docker push $CONTAINER_TEST_IMAGE - docker push $CONTAINER_TEST_IMAGE
deploy_latest: deploy_latest:
...@@ -57,10 +61,11 @@ deploy_latest: ...@@ -57,10 +61,11 @@ deploy_latest:
- docker tag $CONTAINER_TEST_IMAGE-panel $CI_REGISTRY_IMAGE:latest - docker tag $CONTAINER_TEST_IMAGE-panel $CI_REGISTRY_IMAGE:latest
- docker tag $CONTAINER_TEST_IMAGE-daemon $CI_REGISTRY_IMAGE:daemon - docker tag $CONTAINER_TEST_IMAGE-daemon $CI_REGISTRY_IMAGE:daemon
- docker tag $CONTAINER_TEST_IMAGE-sftp $CI_REGISTRY_IMAGE:sftp - docker tag $CONTAINER_TEST_IMAGE-sftp $CI_REGISTRY_IMAGE:sftp
- docker push $CI_REGISTRY_IMAGE:panel - docker tag $CONTAINER_TEST_IMAGE-panel $CI_REGISTRY_IMAGE:panel-$PANEL_VERSION
- docker push $CI_REGISTRY_IMAGE:latest - docker tag $CONTAINER_TEST_IMAGE-panel $CI_REGISTRY_IMAGE:$PANEL_VERSION
- docker push $CI_REGISTRY_IMAGE:daemon - docker tag $CONTAINER_TEST_IMAGE-daemon $CI_REGISTRY_IMAGE:daemon-$DAEMON_VERSION
- docker push $CI_REGISTRY_IMAGE:sftp - docker tag $CONTAINER_TEST_IMAGE-sftp $CI_REGISTRY_IMAGE:sftp-$SFTP_VERSION
- docker push $CI_REGISTRY_IMAGE
only: only:
- master - master
......
PANEL_VERSION=v0.7.18 PANEL_VERSION=v0.7.18
DAEMON_VERSION=v0.6.13 DAEMON_VERSION=v0.6.13
SFTP_VERSION=v1.0.4 SFTP_VERSION=v1.0.5
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