From 1cc1b364432210d09ad22305ec380938e60e28a6 Mon Sep 17 00:00:00 2001 From: FyloZ Date: Sat, 22 Jan 2022 00:04:11 -0500 Subject: [PATCH 1/6] Add authentication to CI/CD --- .drone.yml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index 519fccb..2767b89 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,17 +1,23 @@ --- global-variables: release: &release ${DRONE_TAG} + docker-registry-repo: &docker-registry-repo registry.fyloz.dev:5443/colorrecipesexplorer/backend environment: &environment JAVA_VERSION: 11 GRADLE_VERSION: 7.1 CRE_VERSION: dev-${DRONE_BUILD_NUMBER} CRE_ARTIFACT_NAME: ColorRecipesExplorer - CRE_REGISTRY_IMAGE: registry.fyloz.dev:5443/colorrecipesexplorer/backend + CRE_REGISTRY_IMAGE: *docker-registry-repo CRE_PORT: 9101 CRE_RELEASE: *release + docker-settings: &docker-settings + repo: *docker-registry-repo + username: + from_secret: docker_username + password: + from_secret: docker_password gradle-image: &gradle-image gradle:7.1-jdk11 alpine-image: &alpine-image alpine:latest - docker-registry-repo: &docker-registry-repo registry.fyloz.dev:5443/colorrecipesexplorer/backend kind: pipeline name: default @@ -56,7 +62,7 @@ steps: - GRADLE_VERSION - JAVA_VERSION - CRE_VERSION - repo: *docker-registry-repo + <<: *docker-settings when: branch: develop event: @@ -73,7 +79,7 @@ steps: - JAVA_VERSION build_args: - CRE_VERSION=${DRONE_TAG} - repo: *docker-registry-repo + <<: *docker-settings when: event: - tag From 8a74dd01ecc8933a5910c4ce0c075f472d3c16e4 Mon Sep 17 00:00:00 2001 From: FyloZ Date: Sat, 22 Jan 2022 00:09:05 -0500 Subject: [PATCH 2/6] Add authentication to CI/CD --- .drone.yml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/.drone.yml b/.drone.yml index 2767b89..4330346 100644 --- a/.drone.yml +++ b/.drone.yml @@ -10,12 +10,6 @@ global-variables: CRE_REGISTRY_IMAGE: *docker-registry-repo CRE_PORT: 9101 CRE_RELEASE: *release - docker-settings: &docker-settings - repo: *docker-registry-repo - username: - from_secret: docker_username - password: - from_secret: docker_password gradle-image: &gradle-image gradle:7.1-jdk11 alpine-image: &alpine-image alpine:latest @@ -62,7 +56,11 @@ steps: - GRADLE_VERSION - JAVA_VERSION - CRE_VERSION - <<: *docker-settings + repo: *docker-registry-repo + username: + from_secret: docker_username + password: + from_secret: docker_password when: branch: develop event: @@ -79,7 +77,11 @@ steps: - JAVA_VERSION build_args: - CRE_VERSION=${DRONE_TAG} - <<: *docker-settings + repo: *docker-registry-repo + username: + from_secret: docker_username + password: + from_secret: docker_password when: event: - tag From 6b851497e5b30609c44488e1864a7405ed6f1c4f Mon Sep 17 00:00:00 2001 From: FyloZ Date: Sat, 22 Jan 2022 00:26:00 -0500 Subject: [PATCH 3/6] Add authentication to CI/CD --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 4330346..bd2206a 100644 --- a/.drone.yml +++ b/.drone.yml @@ -7,7 +7,7 @@ global-variables: GRADLE_VERSION: 7.1 CRE_VERSION: dev-${DRONE_BUILD_NUMBER} CRE_ARTIFACT_NAME: ColorRecipesExplorer - CRE_REGISTRY_IMAGE: *docker-registry-repo + CRE_REGISTRY_IMAGE: registry.fyloz.dev:5443/colorrecipesexplorer/backend CRE_PORT: 9101 CRE_RELEASE: *release gradle-image: &gradle-image gradle:7.1-jdk11 From 1a1aa0e675a7728a742a8ca570d0c57b85daaf6e Mon Sep 17 00:00:00 2001 From: FyloZ Date: Sun, 23 Jan 2022 00:26:19 -0500 Subject: [PATCH 4/6] Add authentication to CI/CD --- .drone.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.drone.yml b/.drone.yml index bd2206a..a7ab876 100644 --- a/.drone.yml +++ b/.drone.yml @@ -56,11 +56,11 @@ steps: - GRADLE_VERSION - JAVA_VERSION - CRE_VERSION - repo: *docker-registry-repo - username: - from_secret: docker_username - password: - from_secret: docker_password + repo: *docker-registry-repo + username: + from_secret: docker_username + password: + from_secret: docker_password when: branch: develop event: @@ -77,11 +77,11 @@ steps: - JAVA_VERSION build_args: - CRE_VERSION=${DRONE_TAG} - repo: *docker-registry-repo - username: - from_secret: docker_username - password: - from_secret: docker_password + repo: *docker-registry-repo + username: + from_secret: docker_username + password: + from_secret: docker_password when: event: - tag From bdcd7195ac7f29dd1bc48320980fcef95d109a17 Mon Sep 17 00:00:00 2001 From: FyloZ Date: Sun, 23 Jan 2022 00:40:54 -0500 Subject: [PATCH 5/6] Add authentication to CI/CD --- .drone.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index a7ab876..5820a71 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,7 +1,6 @@ --- global-variables: release: &release ${DRONE_TAG} - docker-registry-repo: &docker-registry-repo registry.fyloz.dev:5443/colorrecipesexplorer/backend environment: &environment JAVA_VERSION: 11 GRADLE_VERSION: 7.1 @@ -12,6 +11,8 @@ global-variables: CRE_RELEASE: *release gradle-image: &gradle-image gradle:7.1-jdk11 alpine-image: &alpine-image alpine:latest + docker-registry: &docker-registry registry.fyloz.dev:5443 + docker-registry-repo: &docker-registry-repo registry.fyloz.dev:5443/colorrecipesexplorer/backend kind: pipeline name: default @@ -56,6 +57,7 @@ steps: - GRADLE_VERSION - JAVA_VERSION - CRE_VERSION + registry: *docker-registry repo: *docker-registry-repo username: from_secret: docker_username @@ -77,6 +79,7 @@ steps: - JAVA_VERSION build_args: - CRE_VERSION=${DRONE_TAG} + registry: *docker-registry repo: *docker-registry-repo username: from_secret: docker_username From 3958ec72844b4e1ef8b83466c2415a812e6e0650 Mon Sep 17 00:00:00 2001 From: FyloZ Date: Sun, 23 Jan 2022 00:56:31 -0500 Subject: [PATCH 6/6] Update registry URL --- .drone.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index 5820a71..79cafa0 100644 --- a/.drone.yml +++ b/.drone.yml @@ -6,13 +6,13 @@ global-variables: GRADLE_VERSION: 7.1 CRE_VERSION: dev-${DRONE_BUILD_NUMBER} CRE_ARTIFACT_NAME: ColorRecipesExplorer - CRE_REGISTRY_IMAGE: registry.fyloz.dev:5443/colorrecipesexplorer/backend + CRE_REGISTRY_IMAGE: registry.fyloz.dev/colorrecipesexplorer/backend CRE_PORT: 9101 CRE_RELEASE: *release gradle-image: &gradle-image gradle:7.1-jdk11 alpine-image: &alpine-image alpine:latest - docker-registry: &docker-registry registry.fyloz.dev:5443 - docker-registry-repo: &docker-registry-repo registry.fyloz.dev:5443/colorrecipesexplorer/backend + docker-registry: &docker-registry registry.fyloz.dev + docker-registry-repo: &docker-registry-repo registry.fyloz.dev/colorrecipesexplorer/backend kind: pipeline name: default