Skip to content

Commit ffdbfed

Browse files
Docker images use ubuntu noble jre base image, solarthing docker image now has nc installed
1 parent 415c6d3 commit ffdbfed

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ subprojects {
169169
error("PackageLocation")
170170
// warn("ParameterMissingNullable") // This is useful. Maybe uncomment if we become more religious about use of @Nullable
171171
error("PrivateConstructorForUtilityClass") // not completely ideal for spring classes with static initialization
172-
warn("RemoveUnusedImports")
172+
warn("RemoveUnusedImports") // Only a warning because https://github.com/antlr/antlr4/issues/2568 and https://github.com/google/error-prone/issues/463
173173
// warn("ReturnMissingNullable") // Useful onlyl if we become more religious about use of @Nullable
174174
warn("ReturnsNullCollection")
175175
warn("SwitchDefault")

docker/solarthing-server/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
FROM ghcr.io/retrodaredevil/lavender-jre:21-ubuntu-jammy as builder
1+
FROM ghcr.io/retrodaredevil/lavender-jre:21-ubuntu-noble as builder
22
ARG JAR_LOCATION
33
COPY ${JAR_LOCATION} application.jar
44
RUN java -Djarmode=layertools -jar application.jar extract
55

66

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

99
RUN ["mkdir", "/solarthing"]
1010
WORKDIR "/solarthing"

docker/solarthing/Dockerfile

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
1-
FROM ghcr.io/retrodaredevil/lavender-jre:21-ubuntu-jammy
1+
FROM ghcr.io/retrodaredevil/lavender-jre:21-ubuntu-noble
22
ARG JAR_LOCATION
33
ARG COMMIT_HASH=""
44
ARG REF=""
55

6+
# Install netcat because users may want to run nc to access configuration server
7+
RUN apt-get update && \
8+
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends netcat-openbsd && \
9+
apt-get clean && \
10+
rm -rf /var/lib/apt/lists/*
11+
612
RUN ["mkdir", "/solarthing"]
713
COPY --chmod=0444 ${JAR_LOCATION} /solarthing/solarthing.jar
814
ENV DOCKER=""

0 commit comments

Comments
 (0)