From 59b04c72315d565b6a6950f5c0279f88a2d4bff3 Mon Sep 17 00:00:00 2001 From: Matt York Date: Mon, 5 Feb 2024 09:50:10 +0000 Subject: [PATCH 1/3] Changed the repo to matthewy --- .github/workflows/ci-learning.yml | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci-learning.yml b/.github/workflows/ci-learning.yml index 93bc07c96..c03ae9115 100644 --- a/.github/workflows/ci-learning.yml +++ b/.github/workflows/ci-learning.yml @@ -4,10 +4,13 @@ name: Java CI with Maven (more complex) on: - push: - branches: [ main ] - pull_request: - branches: [ main ] + workflow_dispatch: + +# on: +# push: +# branches: [ main ] +# pull_request: +# branches: [ main ] jobs: @@ -60,11 +63,11 @@ jobs: run: ./mvnw spring-boot:build-image - name: Retag image with jfrog repo - run: docker tag spring-petclinic:3.1.0-SNAPSHOT my0373.jfrog.io/my0373-docker/spring-petclinic:3.1.0-SNAPSHOT + run: docker tag spring-petclinic:3.1.0-SNAPSHOT matthewy.jfrog.io/petclinic-docker/spring-petclinic:3.1.0-SNAPSHOT - name: Export the built image to a tar file env: - IMAGE_NAME: my0373.jfrog.io/my0373-docker/spring-petclinic:3.1.0-SNAPSHOT + IMAGE_NAME: matthewy.jfrog.io/petclinic-docker/spring-petclinic:3.1.0-SNAPSHOT run: docker save $IMAGE_NAME > /tmp/petclinic.tar - name: Upload Image as an artifact @@ -103,12 +106,12 @@ jobs: - name: Scan Image for vulnerabilities run: - jf docker scan my0373.jfrog.io/my0373-docker/spring-petclinic:3.1.0-SNAPSHOT + jf docker scan matthewy.jfrog.io/petclinic-docker/spring-petclinic:3.1.0-SNAPSHOT - name: Push Docker Image to the Artifactory repository env: - IMAGE_NAME: my0373.jfrog.io/my0373-docker/spring-petclinic:3.1.0-SNAPSHOT + IMAGE_NAME: matthewy.jfrog.io/petclinic-docker/spring-petclinic:3.1.0-SNAPSHOT run: jf docker push $IMAGE_NAME From 1b9007f4319b722e37cec48dd60954e63fdf42aa Mon Sep 17 00:00:00 2001 From: Matt York Date: Mon, 5 Feb 2024 09:56:46 +0000 Subject: [PATCH 2/3] Updated minimal --- .github/workflows/ci-minimal.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-minimal.yml b/.github/workflows/ci-minimal.yml index 2cad49f06..7493787fa 100644 --- a/.github/workflows/ci-minimal.yml +++ b/.github/workflows/ci-minimal.yml @@ -65,11 +65,11 @@ jobs: # In order to upload the image to Artifactory, we'll retag the image. - name: Retag image with jfrog repo - run: docker tag spring-petclinic:3.1.0-SNAPSHOT my0373.jfrog.io/my0373-docker/spring-petclinic:3.1.0-SNAPSHOT + run: docker tag spring-petclinic:3.1.0-SNAPSHOT matthewy.jfrog.io/petclinic-docker/spring-petclinic:3.1.0-SNAPSHOT # We push the image into artifactory - name: Push Docker Image to Artifactory env: - IMAGE_NAME: my0373.jfrog.io/my0373-docker/spring-petclinic:3.1.0-SNAPSHOT + IMAGE_NAME: matthewy.jfrog.io/petclinic-docker/spring-petclinic:3.1.0-SNAPSHOT run: jf docker push $IMAGE_NAME From 44756d2a3dde01d6bcf5e617a46982100158b593 Mon Sep 17 00:00:00 2001 From: Matt York Date: Mon, 5 Feb 2024 10:24:32 +0000 Subject: [PATCH 3/3] Changed all workflows to manual --- .github/workflows/ci-minimal.yml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci-minimal.yml b/.github/workflows/ci-minimal.yml index 7493787fa..5735e3860 100644 --- a/.github/workflows/ci-minimal.yml +++ b/.github/workflows/ci-minimal.yml @@ -3,15 +3,18 @@ name: Java CI with Maven (minimal) -# The workflow will execute on Push / PR as well as manually running. on: - push: - branches: - - 'main' + workflow_dispatch: - pull_request: - branches: - - 'main' +# # The workflow will execute on Push / PR as well as manually running. +# on: +# push: +# branches: +# - 'main' + +# pull_request: +# branches: +# - 'main' # The actual workflow jobs. I've split some of these up to