From 935b7458cd5f7e57797cbae99011e5d54b383f7d Mon Sep 17 00:00:00 2001 From: megli2 Date: Fri, 8 Dec 2023 08:53:39 +0100 Subject: [PATCH 1/7] refactor workflow --- .github/workflows/staging-deploy-action.yml | 4 ++-- frontend/angular.json | 21 ------------------- .../src/environments/environment.staging.ts | 16 -------------- 3 files changed, 2 insertions(+), 39 deletions(-) delete mode 100644 frontend/src/environments/environment.staging.ts diff --git a/.github/workflows/staging-deploy-action.yml b/.github/workflows/staging-deploy-action.yml index 55990d4f60..3f08092864 100644 --- a/.github/workflows/staging-deploy-action.yml +++ b/.github/workflows/staging-deploy-action.yml @@ -68,7 +68,7 @@ jobs: run: cd ./frontend && npm run build:staging - name: Build backend with Maven - run: mvn -B clean package --file pom.xml -P staging + run: mvn -B clean package --file pom.xml -P build-for-docker - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 @@ -243,7 +243,7 @@ jobs: - name: 'Push merged SBOM to dependency track' env: - PROJECT_NAME: okr + PROJECT_NAME: okr-staging run: | curl --verbose -s --location --request POST ${{ secrets.DEPENDENCY_TRACK_URL }} \ --header "X-Api-Key: ${{ secrets.SECRET_OWASP_DT_KEY }}" \ diff --git a/frontend/angular.json b/frontend/angular.json index 8d2f1c91cb..122f52587b 100644 --- a/frontend/angular.json +++ b/frontend/angular.json @@ -60,27 +60,6 @@ ], "outputHashing": "all" }, - "staging": { - "budgets": [ - { - "type": "initial", - "maximumWarning": "3mb", - "maximumError": "5mb" - }, - { - "type": "anyComponentStyle", - "maximumWarning": "2kb", - "maximumError": "4kb" - } - ], - "fileReplacements": [ - { - "replace": "src/environments/environment.ts", - "with": "src/environments/environment.staging.ts" - } - ], - "outputHashing": "all" - }, "development": { "buildOptimizer": false, "optimization": false, diff --git a/frontend/src/environments/environment.staging.ts b/frontend/src/environments/environment.staging.ts deleted file mode 100644 index ffb94506cd..0000000000 --- a/frontend/src/environments/environment.staging.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { AuthConfig } from 'angular-oauth2-oidc'; - -export const environment = { - production: true, - oauth: { - decreaseExpirationBySec: 30, - clearHashAfterLogin: true, - issuer: '', - strictDiscoveryDocumentValidation: false, - redirectUri: `${window.location.protocol}//${window.location.hostname}:${window.location.port}`, - scope: 'openid profile', - clientId: 'pitc_okr_staging', - responseType: 'code', - showDebugInformation: true, - } as AuthConfig, -}; From aa12367427030491c9cae0bb01f1695db44839ca Mon Sep 17 00:00:00 2001 From: megli2 Date: Fri, 8 Dec 2023 08:56:58 +0100 Subject: [PATCH 2/7] create sbom generation for deploy pipeline --- .github/workflows/deploy-action.yml | 33 +++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/.github/workflows/deploy-action.yml b/.github/workflows/deploy-action.yml index 249ff71454..184b82a6eb 100644 --- a/.github/workflows/deploy-action.yml +++ b/.github/workflows/deploy-action.yml @@ -89,3 +89,36 @@ jobs: git push origin ${{ vars.TARGET_REFERENCE }} - run: rm -rf ccy-repo shell: bash + generate-and-push-sbom: + runs-on: ubuntu-latest + steps: + - name: Checkout Repository + uses: actions/checkout@v3 + + - name: Install cdxgen + working-directory: frontend + run: npm install -g @cyclonedx/cdxgen@8.6.0 + + - name: 'Generate SBOM for maven dependencies' + working-directory: backend + run: mvn org.cyclonedx:cyclonedx-maven-plugin:makeAggregateBom + + - name: 'Generate SBOM for npm dependencies' + working-directory: frontend + run: cdxgen -o ../sbom-npm.xml -t npm . + + - name: 'Merge frontend and backend SBOMs' + run: | + docker run --rm -v $(pwd):/data cyclonedx/cyclonedx-cli merge --input-files data/backend/target/bom.xml data/sbom-npm.xml --output-file data/sbom.xml + + - name: 'Push merged SBOM to dependency track' + env: + PROJECT_NAME: okr-production + run: | + curl --verbose -s --location --request POST ${{ secrets.DEPENDENCY_TRACK_URL }} \ + --header "X-Api-Key: ${{ secrets.SECRET_OWASP_DT_KEY }}" \ + --header "Content-Type: multipart/form-data" \ + --form "autoCreate=true" \ + --form "projectName=${PROJECT_NAME:-$GITHUB_REPOSITORY}" \ + --form "projectVersion=latest" \ + --form "bom=@sbom.xml" \ No newline at end of file From 4c182ce682713789a9e55b64fbacd02fcc162ac5 Mon Sep 17 00:00:00 2001 From: megli2 Date: Fri, 8 Dec 2023 09:02:29 +0100 Subject: [PATCH 3/7] add e2e tests into deploy workflow --- .github/workflows/deploy-action.yml | 62 ++++++++++++++++++++++++++++- 1 file changed, 61 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy-action.yml b/.github/workflows/deploy-action.yml index 184b82a6eb..c13d5c4093 100644 --- a/.github/workflows/deploy-action.yml +++ b/.github/workflows/deploy-action.yml @@ -89,6 +89,7 @@ jobs: git push origin ${{ vars.TARGET_REFERENCE }} - run: rm -rf ccy-repo shell: bash + generate-and-push-sbom: runs-on: ubuntu-latest steps: @@ -121,4 +122,63 @@ jobs: --form "autoCreate=true" \ --form "projectName=${PROJECT_NAME:-$GITHUB_REPOSITORY}" \ --form "projectVersion=latest" \ - --form "bom=@sbom.xml" \ No newline at end of file + --form "bom=@sbom.xml" + + e2e-docker: + runs-on: ubuntu-22.04 + needs: [ build-docker-image,update-version ] + steps: + - uses: actions/checkout@v3 + + - name: Download artifact + uses: actions/download-artifact@v3 + with: + name: okr-image + path: /tmp + + - name: Load image + run: docker load --input /tmp/okr-docker-image.tar + + - name: show images + run: docker image ls -a + + - name: Run docker image + run: | + docker run --network=host \ + -p 8080:8080 \ + -e SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_ISSUER-URI=http://localhost:8544/realms/pitc \ + -e SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_JWK-SET-URI=http://localhost:8544/realms/pitc/protocol/openid-connect/certs \ + -e SPRING_SECURITY_OAUTH2_RESOURCESERVER_OPAQUETOKEN_CLIENT-ID=pitc_okr_staging \ + -e SPRING_PROFILES_ACTIVE-ID=integration-test \ + -e SPRING_DATASOURCE_URL="jdbc:h2:mem:db;DB_CLOSE_DELAY=-1" \ + -e SPRING_DATASOURCE_USERNAME=user \ + -e SPRING_DATASOURCE_PASSWORD=sa \ + -e SPRING_FLYWAY_LOCATIONS="classpath:db/h2-db/database-h2-schema,classpath:db/h2-db/data-test-h2" \ + ${{ needs.update-version.outputs.okr-docker-image}} & + + - name: run keycloak docker + run: | + docker run \ + -e KEYCLOAK_ADMIN=admin \ + -e KEYCLOAK_ADMIN_PASSWORD=keycloak \ + -v ./docker/config/realm-export.json:/opt/keycloak/data/import/realm.json \ + -p 8544:8080 \ + quay.io/keycloak/keycloak:22.0.0 \ + start-dev --import-realm & + + - uses: abhi1693/setup-browser@v0.3.4 + with: + browser: chrome + version: latest + + - name: Cypress run e2e tests + uses: cypress-io/github-action@v6 + with: + build: npm i -D cypress + install: false + wait-on: 'http://localhost:8080/config, http://localhost:8544' + wait-on-timeout: 120 + browser: chrome + headed: true + working-directory: frontend + config: baseUrl=http://localhost:8080 \ No newline at end of file From 4c962385a9d95b7d66d379f06b448f9cd384f8cd Mon Sep 17 00:00:00 2001 From: megli2 Date: Fri, 8 Dec 2023 09:14:00 +0100 Subject: [PATCH 4/7] change order of jobs and remove 'staging' configuration from npm command --- .github/workflows/deploy-action.yml | 188 ++++++++++---------- .github/workflows/staging-deploy-action.yml | 2 +- 2 files changed, 95 insertions(+), 95 deletions(-) diff --git a/.github/workflows/deploy-action.yml b/.github/workflows/deploy-action.yml index c13d5c4093..27421467ed 100644 --- a/.github/workflows/deploy-action.yml +++ b/.github/workflows/deploy-action.yml @@ -6,6 +6,99 @@ on: jobs: + e2e-docker: + runs-on: ubuntu-22.04 + needs: [ build-docker-image,update-version ] + steps: + - uses: actions/checkout@v3 + + - name: Download artifact + uses: actions/download-artifact@v3 + with: + name: okr-image + path: /tmp + + - name: Load image + run: docker load --input /tmp/okr-docker-image.tar + + - name: show images + run: docker image ls -a + + - name: Run docker image + run: | + docker run --network=host \ + -p 8080:8080 \ + -e SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_ISSUER-URI=http://localhost:8544/realms/pitc \ + -e SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_JWK-SET-URI=http://localhost:8544/realms/pitc/protocol/openid-connect/certs \ + -e SPRING_SECURITY_OAUTH2_RESOURCESERVER_OPAQUETOKEN_CLIENT-ID=pitc_okr_staging \ + -e SPRING_PROFILES_ACTIVE-ID=integration-test \ + -e SPRING_DATASOURCE_URL="jdbc:h2:mem:db;DB_CLOSE_DELAY=-1" \ + -e SPRING_DATASOURCE_USERNAME=user \ + -e SPRING_DATASOURCE_PASSWORD=sa \ + -e SPRING_FLYWAY_LOCATIONS="classpath:db/h2-db/database-h2-schema,classpath:db/h2-db/data-test-h2" \ + ${{ needs.update-version.outputs.okr-docker-image}} & + + - name: run keycloak docker + run: | + docker run \ + -e KEYCLOAK_ADMIN=admin \ + -e KEYCLOAK_ADMIN_PASSWORD=keycloak \ + -v ./docker/config/realm-export.json:/opt/keycloak/data/import/realm.json \ + -p 8544:8080 \ + quay.io/keycloak/keycloak:22.0.0 \ + start-dev --import-realm & + + - uses: abhi1693/setup-browser@v0.3.4 + with: + browser: chrome + version: latest + + - name: Cypress run e2e tests + uses: cypress-io/github-action@v6 + with: + build: npm i -D cypress + install: false + wait-on: 'http://localhost:8080/config, http://localhost:8544' + wait-on-timeout: 120 + browser: chrome + headed: true + working-directory: frontend + config: baseUrl=http://localhost:8080 + + generate-and-push-sbom: + runs-on: ubuntu-latest + steps: + - name: Checkout Repository + uses: actions/checkout@v3 + + - name: Install cdxgen + working-directory: frontend + run: npm install -g @cyclonedx/cdxgen@8.6.0 + + - name: 'Generate SBOM for maven dependencies' + working-directory: backend + run: mvn org.cyclonedx:cyclonedx-maven-plugin:makeAggregateBom + + - name: 'Generate SBOM for npm dependencies' + working-directory: frontend + run: cdxgen -o ../sbom-npm.xml -t npm . + + - name: 'Merge frontend and backend SBOMs' + run: | + docker run --rm -v $(pwd):/data cyclonedx/cyclonedx-cli merge --input-files data/backend/target/bom.xml data/sbom-npm.xml --output-file data/sbom.xml + + - name: 'Push merged SBOM to dependency track' + env: + PROJECT_NAME: okr-production + run: | + curl --verbose -s --location --request POST ${{ secrets.DEPENDENCY_TRACK_URL }} \ + --header "X-Api-Key: ${{ secrets.SECRET_OWASP_DT_KEY }}" \ + --header "Content-Type: multipart/form-data" \ + --form "autoCreate=true" \ + --form "projectName=${PROJECT_NAME:-$GITHUB_REPOSITORY}" \ + --form "projectVersion=latest" \ + --form "bom=@sbom.xml" + okr-deploy: runs-on: ubuntu-latest steps: @@ -88,97 +181,4 @@ jobs: git commit -m "$COMMITPREFIX Automated changes to ${{ vars.FILEPATH }}" && \ git push origin ${{ vars.TARGET_REFERENCE }} - run: rm -rf ccy-repo - shell: bash - - generate-and-push-sbom: - runs-on: ubuntu-latest - steps: - - name: Checkout Repository - uses: actions/checkout@v3 - - - name: Install cdxgen - working-directory: frontend - run: npm install -g @cyclonedx/cdxgen@8.6.0 - - - name: 'Generate SBOM for maven dependencies' - working-directory: backend - run: mvn org.cyclonedx:cyclonedx-maven-plugin:makeAggregateBom - - - name: 'Generate SBOM for npm dependencies' - working-directory: frontend - run: cdxgen -o ../sbom-npm.xml -t npm . - - - name: 'Merge frontend and backend SBOMs' - run: | - docker run --rm -v $(pwd):/data cyclonedx/cyclonedx-cli merge --input-files data/backend/target/bom.xml data/sbom-npm.xml --output-file data/sbom.xml - - - name: 'Push merged SBOM to dependency track' - env: - PROJECT_NAME: okr-production - run: | - curl --verbose -s --location --request POST ${{ secrets.DEPENDENCY_TRACK_URL }} \ - --header "X-Api-Key: ${{ secrets.SECRET_OWASP_DT_KEY }}" \ - --header "Content-Type: multipart/form-data" \ - --form "autoCreate=true" \ - --form "projectName=${PROJECT_NAME:-$GITHUB_REPOSITORY}" \ - --form "projectVersion=latest" \ - --form "bom=@sbom.xml" - - e2e-docker: - runs-on: ubuntu-22.04 - needs: [ build-docker-image,update-version ] - steps: - - uses: actions/checkout@v3 - - - name: Download artifact - uses: actions/download-artifact@v3 - with: - name: okr-image - path: /tmp - - - name: Load image - run: docker load --input /tmp/okr-docker-image.tar - - - name: show images - run: docker image ls -a - - - name: Run docker image - run: | - docker run --network=host \ - -p 8080:8080 \ - -e SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_ISSUER-URI=http://localhost:8544/realms/pitc \ - -e SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_JWK-SET-URI=http://localhost:8544/realms/pitc/protocol/openid-connect/certs \ - -e SPRING_SECURITY_OAUTH2_RESOURCESERVER_OPAQUETOKEN_CLIENT-ID=pitc_okr_staging \ - -e SPRING_PROFILES_ACTIVE-ID=integration-test \ - -e SPRING_DATASOURCE_URL="jdbc:h2:mem:db;DB_CLOSE_DELAY=-1" \ - -e SPRING_DATASOURCE_USERNAME=user \ - -e SPRING_DATASOURCE_PASSWORD=sa \ - -e SPRING_FLYWAY_LOCATIONS="classpath:db/h2-db/database-h2-schema,classpath:db/h2-db/data-test-h2" \ - ${{ needs.update-version.outputs.okr-docker-image}} & - - - name: run keycloak docker - run: | - docker run \ - -e KEYCLOAK_ADMIN=admin \ - -e KEYCLOAK_ADMIN_PASSWORD=keycloak \ - -v ./docker/config/realm-export.json:/opt/keycloak/data/import/realm.json \ - -p 8544:8080 \ - quay.io/keycloak/keycloak:22.0.0 \ - start-dev --import-realm & - - - uses: abhi1693/setup-browser@v0.3.4 - with: - browser: chrome - version: latest - - - name: Cypress run e2e tests - uses: cypress-io/github-action@v6 - with: - build: npm i -D cypress - install: false - wait-on: 'http://localhost:8080/config, http://localhost:8544' - wait-on-timeout: 120 - browser: chrome - headed: true - working-directory: frontend - config: baseUrl=http://localhost:8080 \ No newline at end of file + shell: bash \ No newline at end of file diff --git a/.github/workflows/staging-deploy-action.yml b/.github/workflows/staging-deploy-action.yml index 3f08092864..331a6ff070 100644 --- a/.github/workflows/staging-deploy-action.yml +++ b/.github/workflows/staging-deploy-action.yml @@ -65,7 +65,7 @@ jobs: run: cd ./frontend && npm ci - name: Build frontend with Angular - run: cd ./frontend && npm run build:staging + run: cd ./frontend && npm run build - name: Build backend with Maven run: mvn -B clean package --file pom.xml -P build-for-docker From 111ef74a31b7dac3d72b3827c97bb9f87d0922e1 Mon Sep 17 00:00:00 2001 From: megli2 Date: Fri, 8 Dec 2023 09:21:34 +0100 Subject: [PATCH 5/7] add 'needs' keyword to run jobs sequentially --- .github/workflows/deploy-action.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/deploy-action.yml b/.github/workflows/deploy-action.yml index 27421467ed..71864287dd 100644 --- a/.github/workflows/deploy-action.yml +++ b/.github/workflows/deploy-action.yml @@ -67,6 +67,7 @@ jobs: generate-and-push-sbom: runs-on: ubuntu-latest + needs: e2e-docker steps: - name: Checkout Repository uses: actions/checkout@v3 @@ -101,6 +102,7 @@ jobs: okr-deploy: runs-on: ubuntu-latest + needs: [e2e-docker, generate-and-push-sbom] steps: - name: Checkout project uses: actions/checkout@v4 From 6812de0295e756444d13ee31f1c28c42facc3c31 Mon Sep 17 00:00:00 2001 From: megli2 Date: Fri, 8 Dec 2023 11:29:16 +0100 Subject: [PATCH 6/7] rework deploy workflow --- .github/workflows/deploy-action.yml | 145 ++++++++++++++++++++-------- 1 file changed, 103 insertions(+), 42 deletions(-) diff --git a/.github/workflows/deploy-action.yml b/.github/workflows/deploy-action.yml index 71864287dd..8e05d8c13d 100644 --- a/.github/workflows/deploy-action.yml +++ b/.github/workflows/deploy-action.yml @@ -6,9 +6,66 @@ on: jobs: + + extract-version: + runs-on: ubuntu-latest + steps: + - uses: actions + - name: Extract Maven project version + run: echo "version=$(mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec | sed 's/-SNAPSHOT$//')" >> $GITHUB_OUTPUT + id: store-version + + build-docker-image: + needs: extract-version + runs-on: ubuntu-22.04 + steps: + - uses: actions/checkout@v4 + + - name: Set up JDK 17 + uses: actions/setup-java@v4 + with: + java-version: '17' + distribution: 'adopt' + + - name: Set up node 18 + uses: actions/setup-node@v4 + with: + node-version: 18.17.1 + + - name: Install Dependencies + run: cd ./frontend && npm ci + + - name: Build frontend with Angular + run: cd ./frontend && npm run build + + - name: Build backend with Maven + run: mvn -B clean package --file pom.xml -P build-for-docker + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + + - name: Build the docker image + uses: docker/build-push-action@v5 + with: + context: . + file: docker/Dockerfile + tags: ${{ needs.update-version.outputs.okr-docker-image}} + load: true + push: false + outputs: type=docker,dest=/tmp/okr-docker-image.tar + + - name: Upload artifact + uses: actions/upload-artifact@v3 + with: + name: okr-image + path: /tmp/okr-docker-image.tar + + - name: print imagetags + run: echo ${{ needs.update-version.outputs.okr-docker-image}} + e2e-docker: runs-on: ubuntu-22.04 - needs: [ build-docker-image,update-version ] + needs: build-docker-image steps: - uses: actions/checkout@v3 @@ -65,44 +122,9 @@ jobs: working-directory: frontend config: baseUrl=http://localhost:8080 - generate-and-push-sbom: - runs-on: ubuntu-latest - needs: e2e-docker - steps: - - name: Checkout Repository - uses: actions/checkout@v3 - - - name: Install cdxgen - working-directory: frontend - run: npm install -g @cyclonedx/cdxgen@8.6.0 - - - name: 'Generate SBOM for maven dependencies' - working-directory: backend - run: mvn org.cyclonedx:cyclonedx-maven-plugin:makeAggregateBom - - - name: 'Generate SBOM for npm dependencies' - working-directory: frontend - run: cdxgen -o ../sbom-npm.xml -t npm . - - - name: 'Merge frontend and backend SBOMs' - run: | - docker run --rm -v $(pwd):/data cyclonedx/cyclonedx-cli merge --input-files data/backend/target/bom.xml data/sbom-npm.xml --output-file data/sbom.xml - - - name: 'Push merged SBOM to dependency track' - env: - PROJECT_NAME: okr-production - run: | - curl --verbose -s --location --request POST ${{ secrets.DEPENDENCY_TRACK_URL }} \ - --header "X-Api-Key: ${{ secrets.SECRET_OWASP_DT_KEY }}" \ - --header "Content-Type: multipart/form-data" \ - --form "autoCreate=true" \ - --form "projectName=${PROJECT_NAME:-$GITHUB_REPOSITORY}" \ - --form "projectVersion=latest" \ - --form "bom=@sbom.xml" - okr-deploy: runs-on: ubuntu-latest - needs: [e2e-docker, generate-and-push-sbom] + needs: e2e-docker steps: - name: Checkout project uses: actions/checkout@v4 @@ -115,10 +137,6 @@ jobs: server-id: github settings-path: ${{ github.workspace }} - - name: Extract Maven project version - run: echo "version=$(mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec | sed 's/-SNAPSHOT$//')" >> $GITHUB_OUTPUT - id: store-version - - name: Set up node 18 uses: actions/setup-node@v4 with: @@ -183,4 +201,47 @@ jobs: git commit -m "$COMMITPREFIX Automated changes to ${{ vars.FILEPATH }}" && \ git push origin ${{ vars.TARGET_REFERENCE }} - run: rm -rf ccy-repo - shell: bash \ No newline at end of file + shell: bash + + generate-and-push-sbom: + runs-on: ubuntu-latest + needs: okr-deploy + steps: + - name: Checkout Repository + uses: actions/checkout@v3 + + - name: Install cdxgen + working-directory: frontend + run: npm install -g @cyclonedx/cdxgen@8.6.0 + + - name: 'Generate SBOM for maven dependencies' + working-directory: backend + run: mvn org.cyclonedx:cyclonedx-maven-plugin:makeAggregateBom + + - name: 'Generate SBOM for npm dependencies' + working-directory: frontend + run: cdxgen -o ../sbom-npm.xml -t npm . + + - name: 'Merge frontend and backend SBOMs' + run: | + docker run --rm -v $(pwd):/data cyclonedx/cyclonedx-cli merge --input-files data/backend/target/bom.xml data/sbom-npm.xml --output-file data/sbom.xml + + - name: 'Push merged SBOM to dependency track' + env: + PROJECT_NAME: okr-production + run: | + curl --verbose -s --location --request POST ${{ secrets.DEPENDENCY_TRACK_URL }} \ + --header "X-Api-Key: ${{ secrets.SECRET_OWASP_DT_KEY }}" \ + --header "Content-Type: multipart/form-data" \ + --form "autoCreate=true" \ + --form "projectName=${PROJECT_NAME:-$GITHUB_REPOSITORY}" \ + --form "projectVersion=latest" \ + --form "bom=@sbom.xml" + + clean-up: + needs: generate-and-push-sbom + runs-on: ubuntu-latest + + steps: + - name: remove dockers + run: docker ps -aq | xargs -r docker rm -f \ No newline at end of file From df12e90c67d3838a9b604fb90adb931485f5b04f Mon Sep 17 00:00:00 2001 From: megli2 Date: Fri, 8 Dec 2023 11:38:06 +0100 Subject: [PATCH 7/7] change wrong reference --- .github/workflows/deploy-action.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy-action.yml b/.github/workflows/deploy-action.yml index 8e05d8c13d..b5c6fb2875 100644 --- a/.github/workflows/deploy-action.yml +++ b/.github/workflows/deploy-action.yml @@ -49,7 +49,7 @@ jobs: with: context: . file: docker/Dockerfile - tags: ${{ needs.update-version.outputs.okr-docker-image}} + tags: ${{ steps.store-version.outputs.version }} load: true push: false outputs: type=docker,dest=/tmp/okr-docker-image.tar @@ -61,7 +61,7 @@ jobs: path: /tmp/okr-docker-image.tar - name: print imagetags - run: echo ${{ needs.update-version.outputs.okr-docker-image}} + run: echo ${{ steps.store-version.outputs.version }} e2e-docker: runs-on: ubuntu-22.04 @@ -93,7 +93,7 @@ jobs: -e SPRING_DATASOURCE_USERNAME=user \ -e SPRING_DATASOURCE_PASSWORD=sa \ -e SPRING_FLYWAY_LOCATIONS="classpath:db/h2-db/database-h2-schema,classpath:db/h2-db/data-test-h2" \ - ${{ needs.update-version.outputs.okr-docker-image}} & + ${{ steps.store-version.outputs.version }} & - name: run keycloak docker run: |