Skip to content

Commit

Permalink
fix: updated Java version on Dockerfile
Browse files Browse the repository at this point in the history
  • Loading branch information
andrea-deri committed Apr 4, 2024
1 parent 75fd550 commit b4b77d6
Show file tree
Hide file tree
Showing 7 changed files with 30 additions and 30 deletions.
10 changes: 5 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
#
# Build
#
FROM maven:3.8.4-jdk-11-slim as buildtime
FROM maven:3.9.5-amazoncorretto-17-al2023@sha256:eeaa7ab572d931f7273fc5cf31429923f172091ae388969e11f42ec6dd817d74 as buildtime
WORKDIR /build
COPY . .
RUN mvn clean package
RUN mvn clean package -Dmaven.test.skip=true


FROM adoptopenjdk/openjdk11:alpine-jre as builder
FROM amazoncorretto:17.0.9-alpine3.18@sha256:df48bf2e183230040890460ddb4359a10aa6c7aad24bd88899482c52053c7e17 as builder
COPY --from=buildtime /build/target/*.jar application.jar
RUN java -Djarmode=layertools -jar application.jar extract


FROM ghcr.io/pagopa/docker-base-springboot-openjdk11:v1.0.1@sha256:bbbe948e91efa0a3e66d8f308047ec255f64898e7f9250bdb63985efd3a95dbf
FROM ghcr.io/pagopa/docker-base-springboot-openjdk17:v1.1.0@sha256:6fa320d452fa22066441f1ef292d15eb06f944bc8bca293e1a91ea460d30a613
ADD --chown=spring:spring https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v1.25.1/opentelemetry-javaagent.jar .

COPY --chown=spring:spring --from=builder dependencies/ ./
Expand All @@ -24,4 +24,4 @@ COPY --chown=spring:spring --from=builder application/ ./

EXPOSE 8080

ENTRYPOINT ["java","-javaagent:opentelemetry-javaagent.jar","--enable-preview","org.springframework.boot.loader.JarLauncher"]
ENTRYPOINT ["java","-javaagent:opentelemetry-javaagent.jar","--enable-preview","org.springframework.boot.loader.JarLauncher"]
4 changes: 2 additions & 2 deletions helm/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ apiVersion: v2
name: pagopa-iuvgenerator
description: Microservice that permits to generate unique IUV codes for each creditor institution.
type: application
version: 0.1.0
appVersion: 0.1.0
version: 0.0.1
appVersion: 0.0.1
dependencies:
- name: microservice-chart
version: 3.0.0
Expand Down
14 changes: 7 additions & 7 deletions helm/values-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ microservice-chart:
fullnameOverride: ""
image:
repository: ghcr.io/pagopa/pagopa-iuvgenerator
tag: "0.1.0"
tag: "0.0.1"
pullPolicy: Always
livenessProbe:
httpGet:
Expand Down Expand Up @@ -34,9 +34,9 @@ microservice-chart:
servicePort: 8080
serviceAccount:
create: false
annotations: {}
annotations: { }
name: ""
podAnnotations: {}
podAnnotations: { }
podSecurityContext:
seccompProfile:
type: RuntimeDefault
Expand Down Expand Up @@ -87,8 +87,8 @@ microservice-chart:
tenantId: "7788edaf-0346-4068-9d79-c868aed15b3d"
tmpVolumeMount:
create: true
nodeSelector: {}
tolerations: []
nodeSelector: { }
tolerations: [ ]
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
Expand All @@ -115,5 +115,5 @@ microservice-chart:
repository: ghcr.io/pagopa/pagopa-iuvgenerator
tag: "0.0.0"
pullPolicy: Always
envConfig: {}
envSecret: {}
envConfig: { }
envSecret: { }
14 changes: 7 additions & 7 deletions helm/values-prod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ microservice-chart:
fullnameOverride: ""
image:
repository: ghcr.io/pagopa/pagopa-iuvgenerator
tag: "0.1.0"
tag: "0.0.1"
pullPolicy: Always
livenessProbe:
httpGet:
Expand Down Expand Up @@ -34,9 +34,9 @@ microservice-chart:
servicePort: 8080
serviceAccount:
create: false
annotations: {}
annotations: { }
name: ""
podAnnotations: {}
podAnnotations: { }
podSecurityContext:
seccompProfile:
type: RuntimeDefault
Expand Down Expand Up @@ -87,8 +87,8 @@ microservice-chart:
tenantId: "7788edaf-0346-4068-9d79-c868aed15b3d"
tmpVolumeMount:
create: true
nodeSelector: {}
tolerations: []
nodeSelector: { }
tolerations: [ ]
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
Expand All @@ -115,5 +115,5 @@ microservice-chart:
repository: ghcr.io/pagopa/pagopa-iuvgenerator
tag: "0.0.0"
pullPolicy: Always
envConfig: {}
envSecret: {}
envConfig: { }
envSecret: { }
14 changes: 7 additions & 7 deletions helm/values-uat.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ microservice-chart:
fullnameOverride: ""
image:
repository: ghcr.io/pagopa/pagopa-iuvgenerator
tag: "0.1.0"
tag: "0.0.1"
pullPolicy: Always
livenessProbe:
httpGet:
Expand Down Expand Up @@ -34,9 +34,9 @@ microservice-chart:
servicePort: 8080
serviceAccount:
create: false
annotations: {}
annotations: { }
name: ""
podAnnotations: {}
podAnnotations: { }
podSecurityContext:
seccompProfile:
type: RuntimeDefault
Expand Down Expand Up @@ -87,8 +87,8 @@ microservice-chart:
tenantId: "7788edaf-0346-4068-9d79-c868aed15b3d"
tmpVolumeMount:
create: true
nodeSelector: {}
tolerations: []
nodeSelector: { }
tolerations: [ ]
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
Expand All @@ -115,5 +115,5 @@ microservice-chart:
repository: ghcr.io/pagopa/pagopa-iuvgenerator
tag: "0.0.0"
pullPolicy: Always
envConfig: {}
envSecret: {}
envConfig: { }
envSecret: { }
2 changes: 1 addition & 1 deletion openapi/openapi.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"info": {
"description": "null\n\n**STANDARD ERRORS:**\nNAME | CODE | DESCRIPTION\n- | - | -\n**IUVG-1000** | *GENERIC_ERROR* | Error while generating IUV. *...error description...*\n**IUVG-1001** | *VALIDATION_ERROR* | Error while validating IUV generation request. *...error description...*\n**IUVG-1101** | *GENERATION_MAX_RETRIES_REACHED* | Error while generating IUV. Reached the maximum number of internal automatic attempts [*...content...*] to generate a unique IUV. Please, try again later.\n**IUVG-1102** | *GENERATION_AUXDIGIT_ALGORITHM_INVALID_PATTERN* | Error while generating IUV. The IUV code's section generated by timestamp in milliseconds is not correctly composited of 13 digits.\n",
"title": "OpenAPI definition",
"version": "0.1.0"
"version": "0.0.1"
},
"servers": [
{
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<groupId>it.gov.pagopa</groupId>
<artifactId>iuvgenerator</artifactId>
<version>0.1.0</version>
<version>0.0.1</version>
<name>pagoPA IUV Generator</name>
<description>A service that permits to generate unique IUV codes for each creditor institution.</description>

Expand Down

0 comments on commit b4b77d6

Please sign in to comment.