Merge pull request #31 from OmniFish-EE/ondromih-beyond-7.1.0

7.1.0, plus Embedded GlassFish image, plus fixes

Author: dmatej

.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 …thub/workflows/docker-server-publish.yml.github/workflows/docker-publish.yml renamed to .github/workflows/docker-server-publish.yml .github/workflows/docker-publish.yml renamed to .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"]