Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/docker-embedded-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
gfVersion:
description: 'The value of the glassfish.version property, used also to build the image.'
required: true
default: '7.1.0'
default: '8.0.0'
basicImage:
description: 'The basic docker image'
required: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-server-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
gfVersion:
description: 'The value of the glassfish.version property, used also to build the image.'
required: true
default: '7.1.0'
default: '8.0.0'
basicImage:
description: 'The basic docker image'
required: true
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<name>Eclipse Glassfish Docker Image Distribution</name>

<properties>
<glassfish.version>7.1.0</glassfish.version>
<glassfish.version>8.0.0</glassfish.version>

<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

Expand Down
8 changes: 5 additions & 3 deletions src/main/resources/images/server/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ ARG AS_ADMIN_PASSWORD=admin \
PATH_GF_PASSWORD_FILE_FOR_CHANGE=/password-change.txt \
UID=1000 \
GID=1000
ENV PATH_GF_HOME=/opt/glassfish7 \
ENV PATH_GF_HOME=/opt/glassfish \
AS_ADMIN_USER=admin \
AS_ADMIN_PASSWORDFILE=/password.txt
ENV AS_USER=${AS_ADMIN_USER} \
Expand Down Expand Up @@ -47,8 +47,10 @@ RUN true \
&& rm glassfish.zip.asc \
&& echo "$GLASSFISH_DOWNLOAD_SHA512 glassfish.zip" | sha512sum --strict --check \
&& mkdir -p "${PATH_GF_HOME}" \
&& unzip -q glassfish.zip -d "${PATH_GF_HOME}/.." \
&& rm glassfish.zip \
&& TMPDIR=$(mktemp -d /opt/gfXXXX) \
&& unzip -q glassfish.zip -d "$TMPDIR" \
&& cp -r "$TMPDIR"/*/* "${PATH_GF_HOME}/" \
&& rm -rf "$TMPDIR" glassfish.zip \
&& userdel -r ubuntu \
&& groupadd -g ${GID} glassfish \
&& useradd -r -l -u ${UID} -g ${GID} -d "${PATH_GF_HOME}" -s /bin/bash glassfish \
Expand Down