Browse Source

Merge branch 'dockerhub' into 'master'

Temporarily push to dockerhub instead of gitlab

See merge request Isleward/isleward!500
tags/v0.8.2^2
Big Bad Waffle 3 years ago
parent
commit
51d8d4c612
1 changed files with 12 additions and 6 deletions
  1. +12
    -6
      .gitlab-ci.yml

+ 12
- 6
.gitlab-ci.yml View File

@@ -39,10 +39,13 @@ build-image-latest:
services:
- docker:dind
before_script:
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
# - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
- echo "$DOCKERHUB_TOKEN" | docker login --username $DOCKERHUB_USERNAME
variables:
IMAGE_TAG_REF: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
IMAGE_TAG_ALIAS: $CI_REGISTRY_IMAGE:latest
#IMAGE_TAG_REF: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
#IMAGE_TAG_ALIAS: $CI_REGISTRY_IMAGE:latest
IMAGE_TAG_REF: isleward/isleward:$CI_COMMIT_REF_SLUG
IMAGE_TAG_ALIAS: isleward/isleward:latest
script:
- docker build -t $IMAGE_TAG_REF -t $IMAGE_TAG_ALIAS .
- docker push $IMAGE_TAG_REF
@@ -56,10 +59,13 @@ build-image-stable:
services:
- docker:dind
before_script:
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
# - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
- echo "$DOCKERHUB_TOKEN" | docker login --username $DOCKERHUB_USERNAME
variables:
IMAGE_TAG_REF: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
IMAGE_TAG_ALIAS: $CI_REGISTRY_IMAGE:stable
#IMAGE_TAG_REF: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
#IMAGE_TAG_ALIAS: $CI_REGISTRY_IMAGE:stable
IMAGE_TAG_REF: isleward/isleward:$CI_COMMIT_REF_SLUG
IMAGE_TAG_ALIAS: isleward/isleward:stable
script:
- docker build -t $IMAGE_TAG_REF -t $IMAGE_TAG_ALIAS .
- docker push $IMAGE_TAG_REF


Loading…
Cancel
Save