From 7e15f2f633e8540732124616db7b582d2d1347e3 Mon Sep 17 00:00:00 2001 From: Louis Vallat Date: Thu, 29 Oct 2020 17:26:13 +0100 Subject: [PATCH] Still trying to get auto-deploy to work Signed-off-by: Louis Vallat --- .gitlab-ci.yml | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 18757fc..79bc892 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,7 +5,7 @@ services: stages: - build - test - - deploy + - release # Disable the Gradle daemon for Continuous Integration servers as correctness # is usually a priority over speed in CI environments. Using a fresh @@ -16,10 +16,12 @@ variables: # Use TLS https://docs.gitlab.com/ee/ci/docker/using_docker_build.html#tls-enabled DOCKER_HOST: tcp://docker:2376 DOCKER_TLS_CERTDIR: "/certs" - CONTAINER_LATEST_IMAGE: $CI_REGISTRY_IMAGE:latest + CONTAINER_TEST_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG + CONTAINER_RELEASE_IMAGE: $CI_REGISTRY_IMAGE:latest before_script: - export GRADLE_USER_HOME=`pwd`/.gradle + - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY build: image: gradle:jdk15 @@ -44,19 +46,12 @@ test: - build/libs/*.jar - .gradle - -package: - stage: deploy - image: $CI_REGISTRY/group/project/docker:19.03.12 - services: - - name: $CI_REGISTRY/group/project/docker:19.03.12-dind - alias: docker - variables: - IMAGE_LATEST_TAG: $CI_REGISTRY_IMAGE:latest - IMAGE_COMMIT_REF_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG +release-image: + stage: release script: - - docker login -u $CI_REGISTRY_IMAGE -p $CI_BUILD_TOKEN $CI_REGISTRY - - docker build -t $IMAGE_LATEST_TAG -t $IMAGE_COMMIT_REF_TAG . - - docker push $IMAGE_LATEST_TAG $IMAGE_COMMIT_REF_TAG + - docker info + - docker pull $CONTAINER_TEST_IMAGE + - docker tag $CONTAINER_TEST_IMAGE $CONTAINER_RELEASE_IMAGE + - docker push $CONTAINER_RELEASE_IMAGE only: - master \ No newline at end of file