Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci-quarkus-build-publish-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ jobs:
--path . \
--buildpack docker://paketobuildpacks/quarkus \
--buildpack docker://paketobuildpacks/java-native-image \
--builder paketobuildpacks/${{ inputs.image-pack }} \
--builder paketobuildpacks/${{ inputs.image-pack }}:0.0.440 \
--volume "${HOME}/.m2:/home/cnb/.m2:rw" \
--env BP_JVM_VERSION="${{ inputs.java-version }}" \
--env BP_MAVEN_POM_FILE="./pom.xml" \
Expand All @@ -151,7 +151,7 @@ jobs:
--path . \
--buildpack docker://paketobuildpacks/quarkus \
--buildpack docker://paketobuildpacks/java \
--builder paketobuildpacks/${{ inputs.image-pack }} \
--builder paketobuildpacks/${{ inputs.image-pack }}:0.0.440 \
--volume "${HOME}/.m2:/home/cnb/.m2:rw" \
--env BP_JVM_VERSION="${{ inputs.java-version }}" \
--env BP_MAVEN_POM_FILE="./pom.xml" \
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci-quarkus-container-scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ jobs:
--path . \
--buildpack docker://paketobuildpacks/quarkus \
--buildpack docker://paketobuildpacks/java-native-image \
--builder paketobuildpacks/${{ inputs.image-pack }} \
--builder paketobuildpacks/${{ inputs.image-pack }}:0.0.440 \
--volume "${HOME}/.m2:/home/cnb/.m2:rw" \
--env BP_JVM_VERSION="${{ inputs.java-version }}" \
--env BP_MAVEN_POM_FILE="./pom.xml" \
Expand All @@ -107,7 +107,7 @@ jobs:
--path . \
--buildpack docker://paketobuildpacks/quarkus \
--buildpack docker://paketobuildpacks/java \
--builder paketobuildpacks/${{ inputs.image-pack }} \
--builder paketobuildpacks/${{ inputs.image-pack }}:0.0.440 \
--volume "${HOME}/.m2:/home/cnb/.m2:rw" \
--env BP_JVM_VERSION="${{ inputs.java-version }}" \
--env BP_MAVEN_POM_FILE="./pom.xml" \
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci-spring-boot-build-publish-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ jobs:
mvn -B spring-boot:build-image \
--file ${{ inputs.application-path }}pom.xml \
-Dspring-boot.build-image.imageName=${{ steps.set-image-name.outputs.image-name }}:${{ steps.set-image-tag.outputs.image-tag }} \
-Dspring-boot.build-image.builder=paketobuildpacks/${{ inputs.image-pack }} \
-Dspring-boot.build-image.builder=paketobuildpacks/${{ inputs.image-pack }}:0.0.440 \
-Dspring-boot.build-image.createdDate=now

- name: Set trivyignore env if file exists
Expand Down Expand Up @@ -251,7 +251,7 @@ jobs:
with:
name: "sbom-${{ steps.sbom-name.outputs.sbom-artifact-id }}-${{ steps.set-image-tag.outputs.image-tag }}"
path: "${{ github.workspace }}/sbom-${{ steps.sbom-name.outputs.sbom-artifact-id }}-${{ steps.set-image-tag.outputs.image-tag }}.json"

# Login to GHCR if container-registry starts with ghcr.io
- name: Login to GitHub Container Registry
if: contains(inputs.container-registry, 'ghcr.io')
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-spring-boot-container-scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ jobs:

- name: Build image with Maven (application-path, skips tests)
if: inputs.module-name == ''
run: mvn -DskipTests -B spring-boot:build-image --file ${{ inputs.application-path }}pom.xml -Dspring-boot.build-image.imageName=${{ steps.set-image-name.outputs.image-name }}:${{ steps.set-image-tag.outputs.image-tag }} -Dspring-boot.build-image.builder=paketobuildpacks/${{ inputs.image-pack }}
run: mvn -DskipTests -B spring-boot:build-image --file ${{ inputs.application-path }}pom.xml -Dspring-boot.build-image.imageName=${{ steps.set-image-name.outputs.image-name }}:${{ steps.set-image-tag.outputs.image-tag }} -Dspring-boot.build-image.builder=paketobuildpacks/${{ inputs.image-pack }}:0.0.440

- name: Run Trivy vulnerability scanner
uses: aquasecurity/trivy-action@b6643a29fecd7f34b3597bc6acb0a98b03d33ff8 # pin@v0.33.1
Expand Down