Skip to content

Commit

Permalink
Setup java 17 and cleanup in Dockerfiles.
Browse files Browse the repository at this point in the history
  • Loading branch information
meier-rene committed Oct 30, 2024
1 parent ea5c6f0 commit bc72f03
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 8 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@ jobs:
# set dev tag for dev branch
type=raw,value=dev,enable=${{ github.ref == 'refs/heads/dev'}}
-
name: Go Build Cache for Docker
name: Maven Build Cache for Docker
uses: actions/cache@v4
with:
path: maven-cache
key: ${{ runner.os }}-maven-cache-${{ hashFiles('**/pom.xml') }}

- name: inject go-build-cache into docker
-
name: Inject Maven Build Cache into Docker
uses: reproducible-containers/[email protected]
with:
cache-map: |
Expand Down
1 change: 0 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ COPY pom.xml /MetFragRelaunched/
RUN printf '# local database file folder \n\
LocalDatabasesFolderForWeb = /vol/file_databases' > /MetFragRelaunched/MetFragWeb/src/main/webapp/resources/settings.properties

# Cache Maven dependencies using a named cache
RUN --mount=type=cache,target=/root/.m2 mvn -f MetFragRelaunched clean package -pl MetFragWeb -am -DskipTests

FROM alpine:latest AS downloader
Expand Down
7 changes: 3 additions & 4 deletions Dockerfile-REST
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM maven:3-jdk-11 AS builder
FROM maven:3.8-eclipse-temurin-17 AS builder

COPY MetFragLib/ /MetFragRelaunched/MetFragLib/
COPY MetFragCommandLine/ /MetFragRelaunched/MetFragCommandLine/
Expand All @@ -11,11 +11,10 @@ COPY pom.xml /MetFragRelaunched/
RUN printf '# local database file folder \n\
LocalDatabasesFolderForWeb = /vol/file_databases' > /MetFragRelaunched/MetFragWeb/src/main/webapp/resources/settings.properties

RUN mvn -Dhttps.protocols=TLSv1.2 -f MetFragRelaunched clean package -pl MetFragLib -pl MetFragRest -am -DskipTests

RUN --mount=type=cache,target=/root/.m2 mvn -f MetFragRelaunched clean package -pl MetFragRest -am -DskipTests

#FROM tomee:8
FROM maven:3-jdk-11
FROM eclipse-temurin:17

RUN set -eux; \
apt-get update; \
Expand Down

0 comments on commit bc72f03

Please sign in to comment.