From cfc7dd11f54ce667af0bd1ce43f510923793eca0 Mon Sep 17 00:00:00 2001 From: Aarni Halinen Date: Sun, 28 May 2023 23:13:39 +0300 Subject: [PATCH 1/4] Test deploy token --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e8abc04..08fba05 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -87,7 +87,7 @@ publish:dev: - master script: - docker info - - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY + - docker login -u $CI_DEPLOY_USER -p $CI_DEPLOY_PASSWORD $CI_REGISTRY - docker build . -t "$IMAGE_NAME":latest --build-arg SENTRY_AUTH_TOKEN="$SENTRY_AUTH_TOKEN" --build-arg NEXT_PUBLIC_DEPLOY_ENV=development --build-arg NEXT_PUBLIC_API_URL=https://api.dev.sahkoinsinoorikilta.fi/api --build-arg NEXT_PUBLIC_SITE_URL=https://dev.sahkoinsinoorikilta.fi - docker push "$IMAGE_NAME":latest @@ -100,7 +100,7 @@ publish:prod: - production script: - docker info - - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY + - docker login -u $CI_DEPLOY_USER -p $CI_DEPLOY_PASSWORD $CI_REGISTRY - docker build . -t "$IMAGE_NAME":prod --build-arg SENTRY_AUTH_TOKEN="$SENTRY_AUTH_TOKEN" - docker push "$IMAGE_NAME":prod @@ -120,7 +120,7 @@ deploy:dev: - echo "$DEV_TLSCACERT" > ~/.docker/ca.pem - echo "$DEV_TLSCERT" > ~/.docker/cert.pem - echo "$DEV_TLSKEY" > ~/.docker/key.pem - - docker login -u gitlab-ci-token -p "$CI_BUILD_TOKEN" "$CI_REGISTRY" + - docker login -u $CI_DEPLOY_USER -p $CI_DEPLOY_PASSWORD $CI_REGISTRY script: - docker stack deploy --with-registry-auth -c stack-compose-dev.yml "$SERVICE_NAME" after_script: @@ -142,7 +142,7 @@ deploy:prod: - echo "$TLSCACERT" > ~/.docker/ca.pem - echo "$TLSCERT" > ~/.docker/cert.pem - echo "$TLSKEY" > ~/.docker/key.pem - - docker login -u gitlab-ci-token -p "$CI_BUILD_TOKEN" "$CI_REGISTRY" + - docker login -u $CI_DEPLOY_USER -p $CI_DEPLOY_PASSWORD $CI_REGISTRY script: - docker stack deploy --with-registry-auth -c stack-compose.yml "$SERVICE_NAME" after_script: From 0e4e02e1b33f643490bc6cbc61e0b34d9ba49883 Mon Sep 17 00:00:00 2001 From: Aarni Halinen Date: Sun, 28 May 2023 23:30:29 +0300 Subject: [PATCH 2/4] Revert "Test deploy token" This reverts commit cfc7dd11f54ce667af0bd1ce43f510923793eca0. --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 08fba05..e8abc04 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -87,7 +87,7 @@ publish:dev: - master script: - docker info - - docker login -u $CI_DEPLOY_USER -p $CI_DEPLOY_PASSWORD $CI_REGISTRY + - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - docker build . -t "$IMAGE_NAME":latest --build-arg SENTRY_AUTH_TOKEN="$SENTRY_AUTH_TOKEN" --build-arg NEXT_PUBLIC_DEPLOY_ENV=development --build-arg NEXT_PUBLIC_API_URL=https://api.dev.sahkoinsinoorikilta.fi/api --build-arg NEXT_PUBLIC_SITE_URL=https://dev.sahkoinsinoorikilta.fi - docker push "$IMAGE_NAME":latest @@ -100,7 +100,7 @@ publish:prod: - production script: - docker info - - docker login -u $CI_DEPLOY_USER -p $CI_DEPLOY_PASSWORD $CI_REGISTRY + - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - docker build . -t "$IMAGE_NAME":prod --build-arg SENTRY_AUTH_TOKEN="$SENTRY_AUTH_TOKEN" - docker push "$IMAGE_NAME":prod @@ -120,7 +120,7 @@ deploy:dev: - echo "$DEV_TLSCACERT" > ~/.docker/ca.pem - echo "$DEV_TLSCERT" > ~/.docker/cert.pem - echo "$DEV_TLSKEY" > ~/.docker/key.pem - - docker login -u $CI_DEPLOY_USER -p $CI_DEPLOY_PASSWORD $CI_REGISTRY + - docker login -u gitlab-ci-token -p "$CI_BUILD_TOKEN" "$CI_REGISTRY" script: - docker stack deploy --with-registry-auth -c stack-compose-dev.yml "$SERVICE_NAME" after_script: @@ -142,7 +142,7 @@ deploy:prod: - echo "$TLSCACERT" > ~/.docker/ca.pem - echo "$TLSCERT" > ~/.docker/cert.pem - echo "$TLSKEY" > ~/.docker/key.pem - - docker login -u $CI_DEPLOY_USER -p $CI_DEPLOY_PASSWORD $CI_REGISTRY + - docker login -u gitlab-ci-token -p "$CI_BUILD_TOKEN" "$CI_REGISTRY" script: - docker stack deploy --with-registry-auth -c stack-compose.yml "$SERVICE_NAME" after_script: From 9f33c667d351114ff9b2e528b8ecf041a5d8cee2 Mon Sep 17 00:00:00 2001 From: Aarni Halinen Date: Sun, 28 May 2023 23:34:34 +0300 Subject: [PATCH 3/4] Copy working login from build step --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e8abc04..c10752e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -120,7 +120,7 @@ deploy:dev: - echo "$DEV_TLSCACERT" > ~/.docker/ca.pem - echo "$DEV_TLSCERT" > ~/.docker/cert.pem - echo "$DEV_TLSKEY" > ~/.docker/key.pem - - docker login -u gitlab-ci-token -p "$CI_BUILD_TOKEN" "$CI_REGISTRY" + - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY script: - docker stack deploy --with-registry-auth -c stack-compose-dev.yml "$SERVICE_NAME" after_script: @@ -142,7 +142,7 @@ deploy:prod: - echo "$TLSCACERT" > ~/.docker/ca.pem - echo "$TLSCERT" > ~/.docker/cert.pem - echo "$TLSKEY" > ~/.docker/key.pem - - docker login -u gitlab-ci-token -p "$CI_BUILD_TOKEN" "$CI_REGISTRY" + - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY script: - docker stack deploy --with-registry-auth -c stack-compose.yml "$SERVICE_NAME" after_script: From 32e541533f9e3a2e5ac35a4e4b7fe883652e7b5e Mon Sep 17 00:00:00 2001 From: Aarni Halinen Date: Sun, 28 May 2023 23:35:48 +0300 Subject: [PATCH 4/4] Small CI/CD cleanup --- .gitlab-ci.yml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c10752e..c439e02 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -86,9 +86,8 @@ publish:dev: only: - master script: - - docker info - - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - docker build . -t "$IMAGE_NAME":latest --build-arg SENTRY_AUTH_TOKEN="$SENTRY_AUTH_TOKEN" --build-arg NEXT_PUBLIC_DEPLOY_ENV=development --build-arg NEXT_PUBLIC_API_URL=https://api.dev.sahkoinsinoorikilta.fi/api --build-arg NEXT_PUBLIC_SITE_URL=https://dev.sahkoinsinoorikilta.fi + - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - docker push "$IMAGE_NAME":latest publish:prod: @@ -99,9 +98,8 @@ publish:prod: only: - production script: - - docker info - - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - docker build . -t "$IMAGE_NAME":prod --build-arg SENTRY_AUTH_TOKEN="$SENTRY_AUTH_TOKEN" + - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - docker push "$IMAGE_NAME":prod deploy:dev: @@ -123,8 +121,6 @@ deploy:dev: - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY script: - docker stack deploy --with-registry-auth -c stack-compose-dev.yml "$SERVICE_NAME" - after_script: - - docker logout "$CI_REGISTRY" deploy:prod: stage: deploy @@ -145,5 +141,3 @@ deploy:prod: - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY script: - docker stack deploy --with-registry-auth -c stack-compose.yml "$SERVICE_NAME" - after_script: - - docker logout "$CI_REGISTRY"