7.1.0, plus Embedded GlassFish image, plus fixes

.github/workflows/docker-embedded-publish.yml

@@ -0,0 +1,61 @@
+name: Publish Embedded GlassFish Docker Image to GitHub
+
+on:
+  workflow_dispatch:
+
+env:
+  # Use docker.io for Docker Hub if empty
+  REGISTRY: ghcr.io
+  # github.repository as <account>/<repo>
+  IMAGE_ID: "ghcr.io/${{ github.repository_owner }}/embedded-glassfish"
+  IMAGE_VERSION: 7.1.0
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: read
+      packages: write
+      # This is used to complete the identity challenge
+      # with sigstore/fulcio when running outside of PRs.
+      id-token: write
+
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+
+      - name: Maven Configure
+        uses: actions/setup-java@v4
+        with:
+          java-version: '21'
+          distribution: 'temurin'
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          driver: docker-container
+          platforms: linux/amd64,linux/arm64
+
+      - name: Build
+        run: mvn clean prepare-package -Dglassfish.version=$IMAGE_VERSION
+
+      - name: Log in to registry
+        run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
+
+      - name: Additional Info
+        run: |
+          mvn -v
+          uname -a
+          docker buildx ls
+          docker buildx imagetools inspect ${{ env.IMAGE_ID }}:latest || echo "No image ${{ env.IMAGE_ID }}:latest exists"
+
+      - name: Build and Deploy
+        uses: docker/build-push-action@v6
+        with:
+          context: images/embedded/${{ env.IMAGE_VERSION }}
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: ${{ env.IMAGE_ID }}:${{ env.IMAGE_VERSION }},${{ env.IMAGE_ID }}:latest
+

.github/workflows/docker-publish.yml → .github/workflows/docker-server-publish.yml

@@ -1,4 +1,4 @@
-name: Docker Publish to GitHub
+name: Publish GlassFish Server Docker Image to GitHub
 
 on:
   workflow_dispatch:
@@ -8,7 +8,7 @@ env:
   REGISTRY: ghcr.io
   # github.repository as <account>/<repo>
   IMAGE_ID: "ghcr.io/${{ github.repository_owner }}/glassfish"
-  IMAGE_VERSION: 7.0.25
+  IMAGE_VERSION: 7.1.0
 
 jobs:
   build:
@@ -49,12 +49,12 @@ jobs:
           mvn -v
           uname -a
           docker buildx ls
-          docker buildx imagetools inspect ${{ env.IMAGE_ID }}:latest
+          docker buildx imagetools inspect ${{ env.IMAGE_ID }}:latest || echo "No image ${{ env.IMAGE_ID }}:latest exists"
 
       - name: Build and Deploy
         uses: docker/build-push-action@v6
         with:
-          context: ${{ env.IMAGE_VERSION }}
+          context: images/server/${{ env.IMAGE_VERSION }}
           platforms: linux/amd64,linux/arm64
           push: true
           tags: ${{ env.IMAGE_ID }}:${{ env.IMAGE_VERSION }},${{ env.IMAGE_ID }}:latest

images/embedded/7.1.0/Dockerfile

@@ -0,0 +1,49 @@
+FROM eclipse-temurin:21-jdk
+
+LABEL org.opencontainers.image.base.name="eclipse-temurin:21-jdk"
+LABEL org.opencontainers.image.source="https://github.com/eclipse-ee4j/glassfish.docker"
+LABEL org.opencontainers.image.url="https://github.com/eclipse-ee4j/glassfish.docker/wiki"
+
+LABEL org.opencontainers.image.title="Embedded Eclipse GlassFish"
+LABEL org.opencontainers.image.description="The Official Eclipse Docker Image for Embedded GlassFish"
+LABEL org.opencontainers.image.version="7.1.0"
+
+LABEL org.opencontainers.image.authors="glassfish-dev@eclipse.org"
+LABEL org.opencontainers.image.vendor="Eclipse Foundation"
+LABEL org.opencontainers.image.licenses="EPL-2.0"
+
+EXPOSE 8080 8181
+
+# You should use own credentials and own files! These are just defaults.
+ARG UID=1000 \
+    GID=1000
+ENV PATH_GF_HOME=/opt/glassfish
+ENV GLASSFISH_DOWNLOAD_SHA512=1e1ad9412445f80c3f05a9902d81df179ca39920e6adad751b41bbda664ed69c86a7abce909692e2020ee93fd84d44958f1f072b932d774dddc5187fdf6a3323 \
+    GLASSFISH_VERSION=7.1.0 \
+    PATH_GF_JAR=${PATH_GF_HOME}/glassfish-embedded-all.jar
+
+RUN true \
+    && set -x \
+    && apt-get update \
+    && apt-get upgrade -y \
+    && apt-get install -y gpg unzip \
+    && mkdir -p "${PATH_GF_HOME}" \
+    && curl -fL "https://repo1.maven.org/maven2/org/glassfish/main/extras/glassfish-embedded-all/${GLASSFISH_VERSION}/glassfish-embedded-all-${GLASSFISH_VERSION}.jar.asc" -o glassfish-embedded-all.jar.asc \
+    && curl -fL "https://repo1.maven.org/maven2/org/glassfish/main/extras/glassfish-embedded-all/${GLASSFISH_VERSION}/glassfish-embedded-all-${GLASSFISH_VERSION}.jar" -o "${PATH_GF_HOME}"/glassfish-embedded-all.jar \
+    && export GNUPGHOME="$(mktemp -d)" \
+    && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys D4A77129F00F736293BE5A51AFC18A2271EDDFE1 \
+    && gpg --batch --verify glassfish-embedded-all.jar.asc "${PATH_GF_HOME}"/glassfish-embedded-all.jar \
+    && rm glassfish-embedded-all.jar.asc \
+    && echo "$GLASSFISH_DOWNLOAD_SHA512 "${PATH_GF_HOME}"/glassfish-embedded-all.jar" | sha512sum --strict --check \
+    && userdel -r ubuntu \
+    && groupadd -g ${GID} glassfish \
+    && useradd -r -l -u ${UID} -g ${GID} -d "${PATH_GF_HOME}" -s /bin/bash glassfish \
+    && env | sort \
+    && chown -R glassfish:glassfish "${PATH_GF_HOME}" \
+    && mkdir ${PATH_GF_HOME}/autodeploy \
+    && ln -s ${PATH_GF_HOME}/autodeploy /deploy \
+    && echo "Installation was successful."
+
+USER glassfish
+WORKDIR ${PATH_GF_HOME}
+ENTRYPOINT ["java", "-jar", "glassfish-embedded-all.jar"]

images/server/7.1.0/Dockerfile

@@ -0,0 +1,85 @@
+FROM eclipse-temurin:21-jdk
+
+LABEL org.opencontainers.image.base.name="eclipse-temurin:21-jdk"
+LABEL org.opencontainers.image.source="https://github.com/eclipse-ee4j/glassfish.docker"
+LABEL org.opencontainers.image.url="https://github.com/eclipse-ee4j/glassfish.docker/wiki"
+
+LABEL org.opencontainers.image.title="Eclipse GlassFish"
+LABEL org.opencontainers.image.description="The Official Eclipse GlassFish Docker Image"
+LABEL org.opencontainers.image.version="7.1.0"
+
+LABEL org.opencontainers.image.authors="glassfish-dev@eclipse.org"
+LABEL org.opencontainers.image.vendor="Eclipse Foundation"
+LABEL org.opencontainers.image.licenses="EPL-2.0"
+
+EXPOSE 4848 9009 8080 8181 8686 3700 3820 3920 6666
+
+# You should use own credentials and own files! These are just defaults.
+ARG AS_ADMIN_PASSWORD=admin \
+    PATH_GF_PASSWORD_FILE_FOR_CHANGE=/password-change.txt \
+    UID=1000 \
+    GID=1000
+ENV PATH_GF_HOME=/opt/glassfish7 \
+    AS_ADMIN_USER=admin \
+    AS_ADMIN_PASSWORDFILE=/password.txt
+ENV AS_USER=${AS_ADMIN_USER} \
+    AS_PASSWORD_FILE=${AS_ADMIN_PASSWORDFILE} \
+    AS_TRACE=false \
+    AS_TRACE_LOGGING=false \
+    AS_TRACE_BOOTSTRAP=false \
+    AS_STOP_TIMEOUT=9500 \
+    GLASSFISH_DOWNLOAD_SHA512=843e5303e7369957ac251ffe326dba0a83f874894cc1983637ac8c2f52fab21f46bc49ce5c3c341d76263d8e9dad8ac53a5befcea69efe5f28f4b8083cfcf150 \
+    GLASSFISH_VERSION=7.1.0 \
+    PATH_GF_BIN=${PATH_GF_HOME}/bin \
+    PATH_GF_SERVER_LOG="${PATH_GF_HOME}/glassfish/domains/domain1/logs/server.log"
+ENV PATH="${PATH_GF_BIN}:${PATH}"
+
+RUN true \
+    && set -x \
+    && apt-get update \
+    && apt-get upgrade -y \
+    && apt-get install -y gpg unzip \
+    && curl -fL "https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/${GLASSFISH_VERSION}/glassfish-${GLASSFISH_VERSION}.zip.asc" -o glassfish.zip.asc \
+    && curl -fL "https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/${GLASSFISH_VERSION}/glassfish-${GLASSFISH_VERSION}.zip" -o glassfish.zip \
+    && export GNUPGHOME="$(mktemp -d)" \
+    && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys D4A77129F00F736293BE5A51AFC18A2271EDDFE1 \
+    && gpg --batch --verify glassfish.zip.asc glassfish.zip \
+    && 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 \
+    && userdel -r ubuntu \
+    && groupadd -g ${GID} glassfish \
+    && useradd -r -l -u ${UID} -g ${GID} -d "${PATH_GF_HOME}" -s /bin/bash glassfish \
+    && echo "Generating password file at ${AS_PASSWORD_FILE} ..." \
+    && set +x \
+    && echo "AS_ADMIN_PASSWORD=${AS_ADMIN_PASSWORD}" > "${AS_PASSWORD_FILE}" \
+    && chown glassfish:glassfish "${AS_PASSWORD_FILE}" \
+    && echo "AS_ADMIN_PASSWORD=" > "${PATH_GF_PASSWORD_FILE_FOR_CHANGE}" \
+    && echo "AS_ADMIN_NEWPASSWORD=${AS_ADMIN_PASSWORD}" >> "${PATH_GF_PASSWORD_FILE_FOR_CHANGE}" \
+    && echo "" >> "${PATH_GF_PASSWORD_FILE_FOR_CHANGE}" \
+    && unset AS_ADMIN_PASSWORD \
+    && set -x \
+    && env | sort \
+    && AS_START_TIMEOUT=120000 asadmin start-domain \
+    && curl  -o /dev/null http://localhost:4848 \
+    && asadmin --passwordfile ${PATH_GF_PASSWORD_FILE_FOR_CHANGE} change-admin-password \
+    && asadmin stop-domain --kill \
+    && AS_START_TIMEOUT=120000 asadmin start-domain \
+    && curl  -o /dev/null http://localhost:4848 \
+    && asadmin set-log-attributes org.glassfish.main.jul.handler.GlassFishLogHandler.enabled=false \
+    && asadmin set-log-attributes org.glassfish.main.jul.handler.SimpleLogHandler.level=FINEST \
+    && asadmin enable-secure-admin \
+    && asadmin stop-domain --kill \
+    && rm -f ${PATH_GF_SERVER_LOG} ${PATH_GF_PASSWORD_FILE_FOR_CHANGE} \
+    && chown -R glassfish:glassfish "${PATH_GF_HOME}" \
+    && ln -s "${PATH_GF_HOME}/glassfish/domains/domain1/autodeploy" /deploy \
+    && echo "Installation was successful."
+
+COPY --chmod=755 docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
+
+USER glassfish
+WORKDIR ${PATH_GF_HOME}
+ENTRYPOINT ["docker-entrypoint.sh"]
+CMD ["startserv"]

src/main/resources/docker-entrypoint.sh → images/server/7.1.0/docker-entrypoint.sh

@@ -8,6 +8,7 @@ change_passwords () {
 
   if [ x"${AS_ADMIN_PASSWORD}" != x ]; then
     echo -e "AS_ADMIN_PASSWORD=admin\nAS_ADMIN_NEWPASSWORD=${AS_ADMIN_PASSWORD}" >> $PWD_FILE
+cat ${PWD_FILE}
     COMMAND="change-admin-password --passwordfile=${PWD_FILE}"
     echo "AS_ADMIN_PASSWORD=${AS_ADMIN_PASSWORD}" > "${AS_PASSWORD_FILE}"
   fi
@@ -19,7 +20,9 @@ change-master-password --passwordfile=${PWD_FILE} --savemasterpassword=true"
   fi
 
   if [ x"${COMMAND}" != x ]; then
-    printf "${COMMAND}" | asadmin --interactive=false
+    printf "${COMMAND}" > /tmp/commands
+    asadmin multimode --interactive=false --file /tmp/commands
+    rm -rf /tmp/commands
   fi
 
   rm -rf ${PWD_FILE}
@@ -36,22 +39,10 @@ if [ -f custom/init.asadmin ]; then
 fi
 
 
-if [ "$1" != 'asadmin' -a "$1" != 'startserv' -a "$1" != 'runembedded' ]; then
+if [ "$1" != 'asadmin' -a "$1" != 'startserv' ]; then
     exec "$@"
 fi
 
-if [ "$1" == 'runembedded' ]; then
-  shift 1
-  if [[ "$SUSPEND" == true ]]
-    then 
-      JVM_OPTS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=9009 $JVM_OPTS"
-  elif [[ "$DEBUG" == true ]]
-    then
-      JVM_OPTS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=9009 $JVM_OPTS"
-  fi
-  exec java $JVM_OPTS -jar glassfish/lib/embedded/glassfish-embedded-static-shell.jar "$@"
-fi
-
 CONTAINER_ALREADY_STARTED="CONTAINER_ALREADY_STARTED_PLACEHOLDER"
 if [ ! -f "$CONTAINER_ALREADY_STARTED" ]
 then

images/server/7.1.0/dockerlibfile-fragment.txt

@@ -0,0 +1,3 @@
+Tags: 7.1.0, 7.1.0-jdk17, 7.1.0-jdk17-eclipse-temurin
+Architectures: amd64, arm64v8
+Directory: 7.1.0

src/main/resources/docs/content.md → images/server/7.1.0/docs/content.md

@@ -1,6 +1,6 @@
 # Eclipse GlassFish Docker images
 
-[Eclipse GlassFish](https://glassfish.org) is a Jakarta EE compatible implementation sponsored by the Eclipse Foundation.
+[Eclipse GlassFish](https://glassfish.org) is a Jakarta EE compatible implementation.
 
 %%LOGO%%
 
@@ -41,28 +41,6 @@ CONTAINER_ID can be found from the output of the following command:
 docker ps
 ```
 
-### Start GlassFish Embedded
-
-Run GlassFish Embedded runnable JAR (static shell) with the following command:
-
-```
-docker run -it -p 8080:8080 @docker.glassfish.repository@ runembedded
-```
-
-This will run GlassFish static shell JAR from the GlassFish installation, which is equivalent to running a standalone GlassFish Embedded JAR. If no applications are deployed, GlassFish Embedded will start an interactive prompt to input commands. For this to work in Docker, the `-it` arguments are needed.
-
-To display usage instructions, run:
-
-```
-docker run -it -p 8080:8080 @docker.glassfish.repository@ runembedded --help
-```
-
-To deploy an application, copy the application into the Docker image or mount the directory that contains it, and then pass the path to it as an argument. For example, if the application myapp.war is copied to the default `/opt/glassfish7` directory:
-
-```
-docker run -p 8080:8080 @docker.glassfish.repository@ runembedded myapp.war
-```
-
 ## Run an application with GlassFish in Docker
 
 You can run an application located in your filesystem with GlassFIsh in a Docker container.
@@ -71,12 +49,20 @@ Follow these steps:
 
 1. Create an empty directory on your filesystem, e.g. `/deployment`
 2. Copy the application package to this directory - so that it's for example on the path `/deployment/application.war`
-3. Run the following command to start GlassFish in Docker with your application, where `/deployments` is path to the directory created in step 1:
+3. Run the following command to start GlassFish in Docker with your application, where `/deployments` is path to the directory created in step 1, and /deploy is the directory in the container where GlassFish expects applications:
+
+```
+docker run -p 8080:8080 -p 4848:4848 -v /deployments:/deploy @docker.glassfish.repository@
+```
+
+Alternatively, you can mount a specific WAR file directly:
 
 ```
-docker run -p 8080:8080 -p 4848:4848 -v /deployments:/opt/glassfish7/glassfish/domains/domain1/autodeploy @docker.glassfish.repository@
+docker run -p 8080:8080 -p 4848:4848 -v /deployment/application.war:/deploy/application.war @docker.glassfish.repository@
 ```
 
+**Note**: GlassFish Server deploys applications using the WAR filename as the context path (e.g., `application.war` becomes accessible at `/application/`).
+
 Then you can open the application in the browser with:
 
 * http://localhost:9080/application
@@ -241,55 +227,6 @@ docker logs 5a11f2fe1a9dd1569974de913a181847aa22165b5015ab20b271b08a27426e72
 docker stop 5a11f2fe1a9dd1569974de913a181847aa22165b5015ab20b271b08a27426e72
 ```
 
-## Running GlassFish Embedded
-
-### Run an application
-
-To deploy an application with GlassFish Embedded, copy the application into the Docker image or mount the directory that contains it, and then pass the path to it as an argument. For example, if the application myapp.war is copied to the default `/opt/glassfish7` directory:
-
-```
-docker run -p 8080:8080 @docker.glassfish.repository@ runembedded myapp.war
-```
-
-You can also just copy applications into the /opt/glassfish7/autodeploy directory or mount a directory with applications to it. All applications in that directory will be automatically deployed. For example, if you have applications on a local directory `/deployments`:
-
-```
-docker run -p 8080:8080 -v /deployments:/opt/glassfish7/autodeploy @docker.glassfish.repository@ runembedded
-```
-
-
-### Configure GlassFish Embedded
-
-You can configure GlassFish Embedded by command line aguments after the command runembedded, or by a configuration file. Several options are supported, for example set a different HTTP port or disable HTTP listener, set path to a custom domain configuration, run asadmin commands at startup, deploy applications.
-
-You can also just create a configuration file called `glassfish.properties` in the default directory `/opt/glassfish7`, with all the options, including commands to execute and applications to deploy. Or specify path to a different configuration file with the `--properties` option.
-
-To display usage instructions, run:
-
-```
-docker run -it -p 8080:8080 @docker.glassfish.repository@ runembedded --help
-```
-
-This Docker image also supports adding custom Java VM arguments, with the JVM_OPTS environments variable. FOr example, you can specify `-XX:MaxRAMPercentage=75` to set maximum heap size to 75% of RAM:
-
-```
-docker run -it -e JVM_OPTS=="-XX:MaxRAMPercentage=75" -p 8080:8080 @docker.glassfish.repository@ runembedded
-```
-
-
-### Debug with GlassFish Embedded
-
-To enable debugging, you can either add a custom debugging instruction for the JVM with the `JVM_OPTS` variable, or you can set one of the following environment variables to `true`:
-
-* `DEBUG` - enables remote debugger on port 9009, doesn't suspend the server
-* `SUSPEND` - suspends the server right at the startup and continues when a debugger connects on port 9009
-
-Example:
-
-```
-docker run -e SUSPEND=true -p 8080:8080 @docker.glassfish.image@ runembedded
-```
-
 ## TestContainers
 
 This is probably the simplest possible test with [GlassFish](https://glassfish.org/) and [TestContainers](https://www.testcontainers.org/). It automatically starts the GlassFish Docker Container and then stops it after the test. The test here is quite trivial - downloads the welcome page and verifies if it contains expected phrases.