Removed unnecessary files and modified github workflow files for docker

OxalisCommunity · Sep 24, 2023 · d1cfeb2 · d1cfeb2
1 parent 6809c30
commit d1cfeb2
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 36 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-as4: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-as4:6.0.0

diff --git a/.travis.yml b/.travis.yml
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
 
@@ -7,6 +7,6 @@ RUN cd $MAVEN_HOME \
  && cp -r target/$(ls target | grep "\-dist$" | head -1) /dist
 
 
-FROM norstella/oxalis:latest
+norstella/oxalis:6.0.0
 
 COPY --from=mvn /dist /oxalis/ext
diff --git a/Dockerfile-Java-11 b/Dockerfile-Java-11