8000 upgrade to bookworm, switch to temurin jre (#9288) · codeperl/localstack@0d7088d · GitHub
[go: up one dir, main page]
Skip to content

Commit 0d7088d

Browse files
alexrashedalexrashed
authored
upgrade to bookworm, switch to temurin jre (localstack#9288)
1 parent 25d164e commit 0d7088d

File tree

3 files changed

+15
-17
lines changed

3 files changed

+15
-17
lines changed

‎.github/dependabot.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,13 @@ updates:
44
directory: "/"
55
schedule:
66
interval: "weekly"
7+
reviewers:
8+
- "alexrashed"
79
ignore:
810
- dependency-name: "python"
911
update-types: ["version-update:semver-major", "version-update:semver-minor"]
12+
- dependency-name: "eclipse-temurin"
13+
update-types: ["version-update:semver-major"]
1014
labels:
1115
- "area: dependencies"
1216
- "semver: patch"
@@ -19,3 +23,7 @@ updates:
1923
labels:
2024
- "area: dependencies"
2125
- "semver: patch"
26+
groups:
27+
github-actions:
28+
patterns:
29+
- "*"

‎.github/workflows/asf-updates.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,6 @@ jobs:
8585
author: "LocalStack Bot <localstack-bot@users.noreply.github.com>"
8686
committer: "LocalStack Bot <localstack-bot@users.noreply.github.com>"
8787
commit-message: "update generated ASF APIs to latest version"
88-
labels: "area: asf, area: dependencies"
88+
labels: "area: asf, area: dependencies, semver: patch"
8989
token: ${{ secrets.PRO_ACCESS_TOKEN }}
9090
reviewers: alexrashed

‎Dockerfile

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,5 @@
1-
# builder: Stage to build a custom JRE (with jlink)
2-
FROM python:3.11.5-slim-buster@sha256:9f35f3a6420693c209c11bba63dcf103d88e47ebe0b205336b5168c122967edf as java-builder
3-
ARG TARGETARCH
4-
5-
# install OpenJDK 11
6-
RUN apt-get update && \
7-
apt-get install -y openjdk-11-jdk-headless && \
8-
apt-get clean && rm -rf /var/lib/apt/lists/*
9-
10-
ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-${TARGETARCH}
1+
# java-builder: Stage to build a custom JRE (with jlink)
2+
FROM eclipse-temurin:11@sha256:271c1393da8cac27d58b64779bd65563737c00297bba9d0ac49e328d4ea87d32 as java-builder
113

124
# create a custom, minimized JRE via jlink
135
RUN jlink --add-modules \
@@ -37,7 +29,7 @@ jdk.localedata --include-locales en,th \
3729

3830

3931
# base: Stage which installs necessary runtime dependencies (OS packages, java,...)
40-
FROM python:3.11.5-slim-buster@sha256:9f35f3a6420693c209c11bba63dcf103d88e47ebe0b205336b5168c122967edf as base
32+
FROM python:3.11.5-slim-bookworm@sha256:edaf703dce209d774af3ff768fc92b1e3b60261e7602126276f9ceb0e3a96874 as base
4133
ARG TARGETARCH
4234

4335
# Install runtime OS package dependencies
@@ -100,11 +92,9 @@ RUN { \
10092
echo 'dirname "$(dirname "$(readlink -f "$(which javac || which java)")")"'; \
10193
} > /usr/local/bin/docker-java-home \
10294
&& chmod +x /usr/local/bin/docker-java-home
103-
COPY --from=java-builder /usr/lib/jvm/java-11 /usr/lib/jvm/java-11
104-
COPY --from=java-builder /etc/ssl/certs/java /etc/ssl/certs/java
105-
COPY --from=java-builder /etc/java-11-openjdk/security /etc/java-11-openjdk/security
106-
RUN ln -s /usr/lib/jvm/java-11/bin/java /usr/bin/java
10795
ENV JAVA_HOME /usr/lib/jvm/java-11
96+
COPY --from=java-builder /usr/lib/jvm/java-11 $JAVA_HOME
97+
RUN ln -s $JAVA_HOME/bin/java /usr/bin/java
10898
ENV PATH "${PATH}:${JAVA_HOME}/bin"
10999

110100
# set workdir
@@ -137,7 +127,7 @@ ADD bin/hosts /etc/hosts
137127
# expose default environment
138128
# Set edge bind host so localstack can be reached by other containers
139129
# set library path and default LocalStack hostname
140-
ENV LD_LIBRARY_PATH=/usr/lib/jvm/java-11/lib:/usr/lib/jvm/java-11/lib/server
130+
ENV LD_LIBRARY_PATH=$JAVA_HOME/lib:$JAVA_HOME/lib/server
141131
ENV USER=localstack
142132
ENV PYTHONUNBUFFERED=1
143133

0 commit comments

Comments
 (0)
0