diff --git a/Dockerfile b/Dockerfile index c56f59d2..857d4250 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM artifacts.developer.gov.bc.ca/docker-remote/maven:3-jdk-11 as build +FROM artifacts.developer.gov.bc.ca/docker-remote/maven:3.8.5-openjdk-17 as build WORKDIR /workspace/app COPY api/pom.xml . @@ -6,7 +6,7 @@ COPY api/src src RUN mvn package -DskipTests RUN mkdir -p target/dependency && (cd target/dependency; jar -xf ../*.jar) -FROM artifacts.developer.gov.bc.ca/docker-remote/openjdk:11-jdk +FROM artifacts.developer.gov.bc.ca/docker-remote/openjdk:17.0.2-jdk-oracle RUN useradd -ms /bin/bash spring RUN mkdir -p /logs RUN chown -R spring:spring /logs diff --git a/api/pom.xml b/api/pom.xml index 7f0e7da2..a5385c61 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -16,7 +16,7 @@ src/main/resources/**,src/main/java/ca/bc/gov/educ/penreg/api/endpoint/**,src/main/java/ca/bc/gov/educ/penreg/api/config/**, src/main/java/ca/bc/gov/educ/penreg/api/mappers/**,src/main/java/ca/bc/gov/educ/penreg/api/exception/**,src/main/java/ca/bc/gov/educ/penreg/api/model/**,src/main/java/ca/bc/gov/educ/penreg/api/struct/** </sonar.exclusions> - <java.version>11</java.version> + <java.version>17</java.version> <maven.compiler.version>3.8.0</maven.compiler.version> <maven.compiler.source>${java.version}</maven.compiler.source>