build configuration related change

OxalisCommunity · Aug 26, 2023 · 3345c7f · 3345c7f
1 parent e23ab36
commit 3345c7f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 47 deletions.
diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
@@ -38,7 +38,7 @@ jobs:
         with:
           builder: ${{ steps.buildx.outputs.name }}
           context: ./
-          file: ./Dockerfile-Java-11
+          file: ./Dockerfile
           platforms: linux/amd64,linux/arm64/v8
           push: true
           tags: norstella/oxalis:6.0.0-latest-java11

diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml
@@ -61,7 +61,7 @@ jobs:
         with:
           builder: ${{ steps.buildx.outputs.name }}
           context: ./
-          file: ./Dockerfile-Java-11
+          file: ./Dockerfile
           platforms: linux/amd64,linux/arm64/v8
           push: true
           tags: norstella/oxalis:6.0.0

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM maven:3.3.9-jdk-8 AS mvn
+FROM maven:3.8.6-jdk-11 AS mvn
 
 ADD . $MAVEN_HOME
 
@@ -26,7 +26,7 @@ RUN cd $MAVEN_HOME \
  && find /oxalis -name .gitkeep -exec rm -rf '{}' \;
 
 
-FROM openjdk:8u212-jre-alpine3.9 as oxalis-base
+FROM openjdk:11.0.16-jre as oxalis-base
 
 COPY --from=mvn /oxalis /oxalis
 

diff --git a/Dockerfile-Java-11 b/Dockerfile-Java-11