Skip to content

Commit

Permalink
chore: small updates
Browse files Browse the repository at this point in the history
  • Loading branch information
mabels committed Dec 19, 2023
1 parent 56955d7 commit 46c8ce6
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 8 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ jobs:
run: |
mvn package -no-transfer-progress
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2

- name: Build - Test Docker
run: |
docker build .
docker buildx build .
16 changes: 9 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#FROM maven:3-jdk-8-alpine
FROM library/openjdk:8-alpine
FROM library/openjdk:23-slim as builder

ENV LC_CTYPE en_US.UTF-8
WORKDIR /app
Expand All @@ -8,14 +8,16 @@ COPY src /app/build/src
#COPY alpn-boot-8.1.11.v20170118.jar /app/
#COPY $HOME/.m2/repository/org/mortbay/jetty/alpn/alpn-boot/8.1.11.v20170118/alpn-boot-8.1.11.v20170118.jar /app

RUN apk update && \
apk add maven && \
apk add ttf-dejavu && \
(cd /app/build && mvn package && cp target/imgsrc*.jar /app/imgsrc.jar) && \
rm -rf /app/build $HOME/.m2
RUN apt-get update -y && \
apt-get install -y maven && \
(cd /app/build && mvn package && cp target/imgsrc*.jar /app/imgsrc.jar)

#COPY cert.pem chain.pem fullchain.pem privkey.pem /app/
FROM library/openjdk:23-slim

RUN apt-get update -y && \
apt-get install -y fonts-dejavu

COPY --from=builder /app/imgsrc.jar /app/imgsrc.jar

#CMD ["java", "-Xbootclasspath/p:/app/alpn-boot-8.1.11.v20170118.jar", "-jar", "/app/imgsrc.jar", "-ssl", "https"]
CMD ["java", "-jar", "/app/imgsrc.jar", "-ssl", "https"]
Expand Down

0 comments on commit 46c8ce6

Please sign in to comment.