Skip to content

Commit

Permalink
fix: [RTD-2142] Upgrade spring boot & base image (#93)
Browse files Browse the repository at this point in the history
* bump base image + bump spring boot

* bump opentelemetry to 1.31.0

* fix cve scan
  • Loading branch information
petretiandrea authored Oct 16, 2023
1 parent 62e8445 commit bd46b01
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/cve-scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:
run: exit 1
- name: Send notification to Slack
id: slack
if: always() && github.event_name == 'schedule' && steps.scan.outcome == 'failure'
if: always() && github.event_name == 'schedule' && steps.cve-threshold.outcome == 'failure'
uses: slackapi/slack-github-action@e28cf165c92ffef168d23c5c9000cffc8a25e117 #v1.24.0
with:
payload: |
Expand All @@ -88,4 +88,4 @@ jobs:
}
env:
SLACK_WEBHOOK_URL: ${{ secrets.CVE_SCAN_SLACK_WEBHOOK }}
SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK
SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK
6 changes: 3 additions & 3 deletions Dockerfile.native
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
FROM ghcr.io/graalvm/native-image:ol8-java17-22@sha256:3210af2c1bdf6a73cd82092909e5ed4674ef09caa1b32f2b05db7f232aba72f2 AS builder
FROM ghcr.io/graalvm/native-image:ol8-java17-22.3.3@sha256:d55ebb6eec6751b87ce9d34ab1004fa088d227d90d3edb4d9b3a994e54ac285a AS builder

WORKDIR /build
COPY . .

RUN ./mvnw clean package -Pnative -DskipTests

FROM ubuntu:jammy-20230624@sha256:0bced47fffa3361afa981854fcabcd4577cd43cebbb808cea2b1f33a3dd7f508 AS cve
FROM ubuntu:mantic-20231011@sha256:4c32aacd0f7d1d3a29e82bee76f892ba9bb6a63f17f9327ca0d97c3d39b9b0ee AS cve
COPY --from=builder /build/target/rtd-ms-sender-auth*.jar .

FROM ubuntu:jammy-20230624@sha256:0bced47fffa3361afa981854fcabcd4577cd43cebbb808cea2b1f33a3dd7f508 AS runtime
FROM ubuntu:mantic-20231011@sha256:4c32aacd0f7d1d3a29e82bee76f892ba9bb6a63f17f9327ca0d97c3d39b9b0ee AS runtime

EXPOSE 8080

Expand Down
8 changes: 4 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.0.4</version>
<version>3.1.4</version>
<relativePath/>
</parent>
<groupId>it.gov.pagopa.rtd.ms</groupId>
<artifactId>rtd-ms-sender-auth</artifactId>
<version>1.1.1</version>
<version>1.1.2</version>
<name>rtd-ms-sender-auth</name>
<description>micro-service responsible to store the association between sender code and api key</description>
<properties>
Expand Down Expand Up @@ -99,14 +99,14 @@
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-bom</artifactId>
<version>1.30.1</version>
<version>1.31.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>io.opentelemetry.instrumentation</groupId>
<artifactId>opentelemetry-instrumentation-bom-alpha</artifactId>
<version>1.30.0-alpha</version>
<version>1.31.0-alpha</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down

0 comments on commit bd46b01

Please sign in to comment.