Commit fdb0ebd7 authored by nanahira's avatar nanahira

fixes

parent fec3bace
Pipeline #6362 passed with stages
in 1 minute and 42 seconds
...@@ -11,8 +11,12 @@ variables: ...@@ -11,8 +11,12 @@ variables:
CONTAINER_TEST_X86_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-x86 CONTAINER_TEST_X86_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-x86
CONTAINER_RELEASE_IMAGE: $CI_REGISTRY_IMAGE:latest CONTAINER_RELEASE_IMAGE: $CI_REGISTRY_IMAGE:latest
before_script: .dockertask:
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY before_script:
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
dependencies: []
tags:
- docker
fetch_source: fetch_source:
stage: fetch stage: fetch
...@@ -29,18 +33,22 @@ fetch_source: ...@@ -29,18 +33,22 @@ fetch_source:
stage: build stage: build
dependencies: dependencies:
- fetch_source - fetch_source
build-x86:
extends: .build
tags: tags:
- docker - docker
build-x86:
extends:
- .dockertask
- .build
script: script:
- cd go-cqhttp - cd go-cqhttp
- docker build --pull -t $CONTAINER_TEST_X86_IMAGE . - docker build --pull -t $CONTAINER_TEST_X86_IMAGE .
- docker push $CONTAINER_TEST_X86_IMAGE - docker push $CONTAINER_TEST_X86_IMAGE
build-arm: build-arm:
extends: .build extends:
- .dockertask
- .build
tags: tags:
- docker-arm - docker-arm
script: script:
...@@ -49,10 +57,9 @@ build-arm: ...@@ -49,10 +57,9 @@ build-arm:
- docker push $CONTAINER_TEST_ARM_IMAGE - docker push $CONTAINER_TEST_ARM_IMAGE
combine: combine:
extends:
- .dockertask
stage: combine stage: combine
dependencies: []
tags:
- docker
script: script:
- docker pull $CONTAINER_TEST_X86_IMAGE - docker pull $CONTAINER_TEST_X86_IMAGE
- docker pull $CONTAINER_TEST_ARM_IMAGE - docker pull $CONTAINER_TEST_ARM_IMAGE
...@@ -61,9 +68,8 @@ combine: ...@@ -61,9 +68,8 @@ combine:
deploy_latest: deploy_latest:
stage: deploy stage: deploy
dependencies: [] extends:
tags: - .dockertask
- docker
script: script:
- docker pull $CONTAINER_TEST_IMAGE - docker pull $CONTAINER_TEST_IMAGE
- docker tag $CONTAINER_TEST_IMAGE $CONTAINER_RELEASE_IMAGE - docker tag $CONTAINER_TEST_IMAGE $CONTAINER_RELEASE_IMAGE
......
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