diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2df1072..169f4ed 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -33,16 +33,6 @@ variables: build:prereleases: stage: dind-build extends: .base - # parallel: - # matrix: - # - REGISTRY_USER: $CI_REGISTRY_USER - # REGISTRY_PASSWORD: $CI_REGISTRY_PASSWORD - # REGISTRY: $CI_REGISTRY - # REGISTRY_IMAGE: $CI_REGISTRY_IMAGE - # - REGISTRY_USER: $HOME_NEXUS_DOCKER_USER - # REGISTRY_PASSWORD: $HOME_NEXUS_DOCKER_PASSWORD - # REGISTRY: $HOME_NEXUS_DOCKER_REGISTRY - # REGISTRY_IMAGE: $HOME_NEXUS_DOCKER_REGISTRY/$CI_PROJECT_PATH tags: - big-build before_script: @@ -50,9 +40,6 @@ build:prereleases: script: - export IMAGE_TAG=$(echo -en $CI_COMMIT_REF_NAME | sed 's|/|-|g') - *build_push - # - export REGISTRY_IMAGE_LOWER=$(echo "$REGISTRY_IMAGE" | tr '[:upper:]' '[:lower:]') - # - docker build --pull -t "$REGISTRY_IMAGE_LOWER:$IMAGE_TAG" --build-arg ARTIFACTORY=$HOME_NEXUS_DOCKER_REGISTRY_SHARED . - # - docker push "$REGISTRY_IMAGE_LOWER:$IMAGE_TAG" only: - branches except: @@ -68,9 +55,6 @@ build:releases: script: - export IMAGE_TAG=$CI_COMMIT_TAG - *build_push - # - export REGISTRY_IMAGE_LOWER=$(echo "$REGISTRY_IMAGE" | tr '[:upper:]' '[:lower:]') - # - docker build --pull -t "$REGISTRY_IMAGE_LOWER:$IMAGE_TAG" --build-arg ARTIFACTORY=$HOME_NEXUS_DOCKER_REGISTRY_SHARED . - # - docker push "$REGISTRY_IMAGE_LOWER:$IMAGE_TAG" - docker tag "$REGISTRY_IMAGE_LOWER:$IMAGE_TAG" "$REGISTRY_IMAGE_LOWER:latest" - docker push "$REGISTRY_IMAGE_LOWER:latest" only: