Skip to content
This repository has been archived by the owner on Jun 29, 2020. It is now read-only.

Fix arch, update and jdk13 #128

Merged
merged 4 commits into from
Jan 20, 2020
Merged

Fix arch, update and jdk13 #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9b3b648
revert to support arm with jre11
gregw Jan 15, 2020
28562cb
remove multistage build from 9.2 and 9.3
gregw Jan 15, 2020
25f2f18
fixed update to modify 9.4 Dockerfile
gregw Jan 17, 2020
4d8c583
updated to latest jetty
gregw Jan 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 1 addition & 15 deletions 9.2-jre8/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM openjdk:13-jdk AS Jetty94
FROM openjdk:8-jre

ENV JETTY_VERSION 9.2.29.v20191105
ENV JETTY_HOME /usr/local/jetty
Expand Down Expand Up @@ -53,20 +53,6 @@ RUN set -xe \
&& cd $JETTY_BASE \
&& modules="$(grep -- ^--module= "$JETTY_HOME/start.ini" | cut -d= -f2 | paste -d, -s)" \
&& java -jar "$JETTY_HOME/start.jar" --add-to-startd="$modules" \
&& rm -rf /tmp/hsperfdata_root

# Start a new image on the target and import jetty
FROM openjdk:8-jre

ENV JETTY_HOME /usr/local/jetty
ENV JETTY_BASE /var/lib/jetty
ENV TMPDIR /tmp/jetty
ENV PATH $JETTY_HOME/bin:$PATH

COPY --from=Jetty94 $JETTY_HOME $JETTY_HOME
COPY --from=Jetty94 $JETTY_BASE $JETTY_BASE

RUN set -xe \
&& mkdir -p "$TMPDIR" \
&& groupadd -r jetty && useradd -r -g jetty jetty \
&& chown -R jetty:jetty "$JETTY_HOME" "$JETTY_BASE" "$TMPDIR" \
Expand Down
16 changes: 1 addition & 15 deletions 9.3-jre8/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM openjdk:13-jdk AS Jetty94
FROM openjdk:8-jre

ENV JETTY_VERSION 9.3.28.v20191105
ENV JETTY_HOME /usr/local/jetty
Expand Down Expand Up @@ -53,20 +53,6 @@ RUN set -xe \
&& cd $JETTY_BASE \
&& modules="$(grep -- ^--module= "$JETTY_HOME/start.ini" | cut -d= -f2 | paste -d, -s)" \
&& java -jar "$JETTY_HOME/start.jar" --add-to-startd="$modules" \
&& rm -rf /tmp/hsperfdata_root

# Start a new image on the target and import jetty
FROM openjdk:8-jre

ENV JETTY_HOME /usr/local/jetty
ENV JETTY_BASE /var/lib/jetty
ENV TMPDIR /tmp/jetty
ENV PATH $JETTY_HOME/bin:$PATH

COPY --from=Jetty94 $JETTY_HOME $JETTY_HOME
COPY --from=Jetty94 $JETTY_BASE $JETTY_BASE

RUN set -xe \
&& mkdir -p "$TMPDIR" \
&& groupadd -r jetty && useradd -r -g jetty jetty \
&& chown -R jetty:jetty "$JETTY_HOME" "$JETTY_BASE" "$TMPDIR" \
Expand Down
2 changes: 1 addition & 1 deletion 9.4-jdk13-slim/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# DO NOT EDIT. Edit Dockerfile-9.4 and use update.sh
FROM openjdk:13-jdk-slim

ENV JETTY_VERSION 9.4.24.v20191120
ENV JETTY_VERSION 9.4.26.v20200117
ENV JETTY_HOME /usr/local/jetty
ENV JETTY_BASE /var/lib/jetty
ENV TMPDIR /tmp/jetty
Expand Down
2 changes: 1 addition & 1 deletion 9.4-jdk13/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# DO NOT EDIT. Edit Dockerfile-9.4 and use update.sh
FROM openjdk:13-jdk

ENV JETTY_VERSION 9.4.24.v20191120
ENV JETTY_VERSION 9.4.26.v20200117
ENV JETTY_HOME /usr/local/jetty
ENV JETTY_BASE /var/lib/jetty
ENV TMPDIR /tmp/jetty
Expand Down
2 changes: 1 addition & 1 deletion 9.4-jre11-slim/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# DO NOT EDIT. Edit Dockerfile-9.4 and use update.sh
FROM openjdk:11-jre-slim

ENV JETTY_VERSION 9.4.24.v20191120
ENV JETTY_VERSION 9.4.26.v20200117
ENV JETTY_HOME /usr/local/jetty
ENV JETTY_BASE /var/lib/jetty
ENV TMPDIR /tmp/jetty
Expand Down
2 changes: 1 addition & 1 deletion 9.4-jre11-slim/arches
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
amd64
amd64, arm64v8
2 changes: 1 addition & 1 deletion 9.4-jre11/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# DO NOT EDIT. Edit Dockerfile-9.4 and use update.sh
FROM openjdk:11-jre

ENV JETTY_VERSION 9.4.24.v20191120
ENV JETTY_VERSION 9.4.26.v20200117
ENV JETTY_HOME /usr/local/jetty
ENV JETTY_BASE /var/lib/jetty
ENV TMPDIR /tmp/jetty
Expand Down
2 changes: 1 addition & 1 deletion 9.4-jre11/arches
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
amd64
amd64, arm64v8
2 changes: 1 addition & 1 deletion 9.4-jre8/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# DO NOT EDIT. Edit Dockerfile-9.4 and use update.sh
FROM openjdk:8-jre

ENV JETTY_VERSION 9.4.24.v20191120
ENV JETTY_VERSION 9.4.26.v20200117
ENV JETTY_HOME /usr/local/jetty
ENV JETTY_BASE /var/lib/jetty
ENV TMPDIR /tmp/jetty
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-9.4
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM openjdk:LABEL

ENV JETTY_VERSION 9.4.24.v20191120
ENV JETTY_VERSION 9.4.26.v20200117
ENV JETTY_HOME /usr/local/jetty
ENV JETTY_BASE /var/lib/jetty
ENV TMPDIR /tmp/jetty
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-9.4-slim
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM openjdk:LABEL

ENV JETTY_VERSION 9.4.24.v20191120
ENV JETTY_VERSION 9.4.26.v20200117
ENV JETTY_HOME /usr/local/jetty
ENV JETTY_BASE /var/lib/jetty
ENV TMPDIR /tmp/jetty
Expand Down
4 changes: 3 additions & 1 deletion update.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,12 @@ for path in "${paths[@]}"; do
if [ -d "$path" ]; then
cp docker-entrypoint.sh generate-jetty-start.sh "$path"
if [ "$version" == "9.4" ] ; then
sed -ri 's/^(ENV JETTY_VERSION) .*/\1 '"$fullVersion"'/; ' "Dockerfile-9.4${variant:+-$variant}"
echo '# DO NOT EDIT. Edit Dockerfile-9.4 and use update.sh' > "$path"/Dockerfile
cat Dockerfile-9.4${variant:+-$variant} >> "$path"/Dockerfile
sed -ri 's/^(FROM openjdk:)LABEL/\1'"$label"'/; ' "$path/Dockerfile"
else
sed -ri 's/^(ENV JETTY_VERSION) .*/\1 '"$fullVersion"'/; ' "$path/Dockerfile"
fi
sed -ri 's/^(ENV JETTY_VERSION) .*/\1 '"$fullVersion"'/; ' "$path/Dockerfile"
fi
done