Skip to content

Commit

Permalink
Docker images use ubuntu noble jre base image, solarthing docker imag…
Browse files Browse the repository at this point in the history
…e now has nc installed
  • Loading branch information
retrodaredevil committed Dec 18, 2024
1 parent 415c6d3 commit ffdbfed
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 4 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ subprojects {
error("PackageLocation")
// warn("ParameterMissingNullable") // This is useful. Maybe uncomment if we become more religious about use of @Nullable
error("PrivateConstructorForUtilityClass") // not completely ideal for spring classes with static initialization
warn("RemoveUnusedImports")
warn("RemoveUnusedImports") // Only a warning because https://github.com/antlr/antlr4/issues/2568 and https://github.com/google/error-prone/issues/463
// warn("ReturnMissingNullable") // Useful onlyl if we become more religious about use of @Nullable
warn("ReturnsNullCollection")
warn("SwitchDefault")
Expand Down
4 changes: 2 additions & 2 deletions docker/solarthing-server/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM ghcr.io/retrodaredevil/lavender-jre:21-ubuntu-jammy as builder
FROM ghcr.io/retrodaredevil/lavender-jre:21-ubuntu-noble as builder
ARG JAR_LOCATION
COPY ${JAR_LOCATION} application.jar
RUN java -Djarmode=layertools -jar application.jar extract


FROM ghcr.io/retrodaredevil/lavender-jre:21-ubuntu-jammy
FROM ghcr.io/retrodaredevil/lavender-jre:21-ubuntu-noble

RUN ["mkdir", "/solarthing"]
WORKDIR "/solarthing"
Expand Down
8 changes: 7 additions & 1 deletion docker/solarthing/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
FROM ghcr.io/retrodaredevil/lavender-jre:21-ubuntu-jammy
FROM ghcr.io/retrodaredevil/lavender-jre:21-ubuntu-noble
ARG JAR_LOCATION
ARG COMMIT_HASH=""
ARG REF=""

# Install netcat because users may want to run nc to access configuration server
RUN apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends netcat-openbsd && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*

RUN ["mkdir", "/solarthing"]
COPY --chmod=0444 ${JAR_LOCATION} /solarthing/solarthing.jar
ENV DOCKER=""
Expand Down

0 comments on commit ffdbfed

Please sign in to comment.