From 754dcb3617c78d9ce8f640baaad68d376c9453c0 Mon Sep 17 00:00:00 2001 From: Ondro Mihalyi Date: Fri, 9 Jan 2026 01:16:13 +0100 Subject: [PATCH 1/9] Prepare Docker image for GlassFish 7.1.0 - Removes Embedded GlassFish support - was based on static shell which isn't supported anymore. Embedded GlassFish will have a separate Docker image - Moved Java version to 21 - Use non-specific JDK 21 image - according to review by Docker team. So that if the image is rebuilt, it uses possibly a newer updated JDK Docker image --- .github/workflows/docker-publish.yml | 2 +- 7.1.0/Dockerfile | 86 ++++++ 7.1.0/docker-entrypoint.sh | 63 +++++ 7.1.0/dockerlibfile-fragment.txt | 3 + 7.1.0/docs/README-short.txt | 2 + 7.1.0/docs/content.md | 259 +++++++++++++++++ 7.1.0/docs/github-repo | 1 + 7.1.0/docs/license.md | 262 ++++++++++++++++++ 7.1.0/docs/logo.svg | 35 +++ 7.1.0/docs/maintainer.md | 1 + pom.xml | 4 +- src/main/resources/docker-entrypoint.sh | 14 +- src/main/resources/docs/content.md | 71 ----- .../distributions/docker/RunembeddedIT.java | 50 ---- 14 files changed, 716 insertions(+), 137 deletions(-) create mode 100644 7.1.0/Dockerfile create mode 100755 7.1.0/docker-entrypoint.sh create mode 100644 7.1.0/dockerlibfile-fragment.txt create mode 100644 7.1.0/docs/README-short.txt create mode 100644 7.1.0/docs/content.md create mode 100644 7.1.0/docs/github-repo create mode 100644 7.1.0/docs/license.md create mode 100644 7.1.0/docs/logo.svg create mode 100644 7.1.0/docs/maintainer.md delete mode 100644 src/test/java/org/glassfish/main/distributions/docker/RunembeddedIT.java diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 8cd6d29..a11f97a 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -8,7 +8,7 @@ env: REGISTRY: ghcr.io # github.repository as / IMAGE_ID: "ghcr.io/${{ github.repository_owner }}/glassfish" - IMAGE_VERSION: 7.0.25 + IMAGE_VERSION: 7.1.0 jobs: build: diff --git a/7.1.0/Dockerfile b/7.1.0/Dockerfile new file mode 100644 index 0000000..7fc38d8 --- /dev/null +++ b/7.1.0/Dockerfile @@ -0,0 +1,86 @@ +FROM eclipse-temurin:21.0.9_10-jdk + +LABEL org.opencontainers.image.base.name="eclipse-temurin:21.0.9_10-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 7676 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}" + +COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh + +RUN true \ + && set -x \ + && apt update \ + && apt upgrade -y \ + && apt 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}" \ + && chmod +x /usr/local/bin/docker-entrypoint.sh \ + && mkdir ${PATH_GF_HOME}/autodeploy \ + && echo "Installation was successful." + +USER glassfish +WORKDIR ${PATH_GF_HOME} +ENTRYPOINT ["docker-entrypoint.sh"] +CMD ["startserv"] diff --git a/7.1.0/docker-entrypoint.sh b/7.1.0/docker-entrypoint.sh new file mode 100755 index 0000000..7d15a85 --- /dev/null +++ b/7.1.0/docker-entrypoint.sh @@ -0,0 +1,63 @@ +#!/bin/bash +set -e; + +change_passwords () { + local PWD_FILE=/tmp/passwordfile + local COMMAND= + rm -rf $PWD_FILE + + if [ x"${AS_ADMIN_PASSWORD}" != x ]; then + echo -e "AS_ADMIN_PASSWORD=admin\nAS_ADMIN_NEWPASSWORD=${AS_ADMIN_PASSWORD}" >> $PWD_FILE + COMMAND="change-admin-password --passwordfile=${PWD_FILE}" + echo "AS_ADMIN_PASSWORD=${AS_ADMIN_PASSWORD}" > "${AS_PASSWORD_FILE}" + fi + + if [ x"${AS_ADMIN_MASTERPASSWORD}" != x ]; then + echo -e "AS_ADMIN_MASTERPASSWORD=changeit\nAS_ADMIN_NEWMASTERPASSWORD=${AS_ADMIN_MASTERPASSWORD}" >> ${PWD_FILE} + COMMAND="${COMMAND} +change-master-password --passwordfile=${PWD_FILE} --savemasterpassword=true" + fi + + if [ x"${COMMAND}" != x ]; then + printf "${COMMAND}" | asadmin --interactive=false + fi + + rm -rf ${PWD_FILE} +} + +change_passwords + +if [ -f custom/init.sh ]; then + /bin/bash custom/init.sh +fi + +if [ -f custom/init.asadmin ]; then + asadmin --interactive=false multimode -f custom/init.asadmin +fi + + +if [ "$1" != 'asadmin' -a "$1" != 'startserv' ]; then + exec "$@" +fi + +CONTAINER_ALREADY_STARTED="CONTAINER_ALREADY_STARTED_PLACEHOLDER" +if [ ! -f "$CONTAINER_ALREADY_STARTED" ] +then + touch "$CONTAINER_ALREADY_STARTED" && + rm -rf glassfish/domains/domain1/autodeploy/.autodeploystatus || true +fi + +if [ "$1" == 'startserv' ]; then + exec "$@" +fi + +on_exit () { + EXIT_CODE=$? + set +e; + ps -lAf; + asadmin stop-domain --force --kill; + exit $EXIT_CODE; +} +trap on_exit EXIT + +env|sort && "$@" & wait diff --git a/7.1.0/dockerlibfile-fragment.txt b/7.1.0/dockerlibfile-fragment.txt new file mode 100644 index 0000000..ee3a4f4 --- /dev/null +++ b/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 diff --git a/7.1.0/docs/README-short.txt b/7.1.0/docs/README-short.txt new file mode 100644 index 0000000..b251187 --- /dev/null +++ b/7.1.0/docs/README-short.txt @@ -0,0 +1,2 @@ +Eclipse GlassFish is a Jakarta EE Full Profile compatible implementation. + diff --git a/7.1.0/docs/content.md b/7.1.0/docs/content.md new file mode 100644 index 0000000..c67fcb1 --- /dev/null +++ b/7.1.0/docs/content.md @@ -0,0 +1,259 @@ +# Eclipse GlassFish Docker images + +[Eclipse GlassFish](https://glassfish.org) is a Jakarta EE compatible implementation sponsored by the Eclipse Foundation. + +%%LOGO%% + +**Source code repository of the Docker image:** https://github.com/eclipse-ee4j/glassfish.docker + +## Quick start + +### Start GlassFish + +Run GlassFish with the following command: + +``` +docker run -p 8080:8080 -p 4848:4848 glassfish +``` + +Or with a command for a specific tag (GlassFish version): + +``` +docker run -p 8080:8080 -p 4848:4848 glassfish:7.1.0 +``` + +Open the following URLs in the browser: + +* **Welcome screen:** http://localhost:8080 +* **Administration Console:** https://localhost:4848 - log in using `admin`/`admin` (User name/Password) + +### Stop GlassFish + +Stop GlassFish with the following command: + +``` +docker stop CONTAINER_ID +``` + +CONTAINER_ID can be found from the output of the following command: + +``` +docker ps +``` + +## Run an application with GlassFish in Docker + +You can run an application located in your filesystem with GlassFIsh in a Docker container. + +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: + +``` +docker run -p 8080:8080 -p 4848:4848 -v /deployments:/opt/glassfish7/glassfish/domains/domain1/autodeploy glassfish +``` + +Then you can open the application in the browser with: + +* http://localhost:9080/application + +The context root (`application`) is derived from the name of the application file (e.g. `application.war` would deployed under the `application` context root). If your application file has a different name, please adjust the contest root in the URL accordingly. + +## Debug GlassFish Server inside a Docker container + +You can modify the start command of the Docker container to `startserv --debug` to enable debug mode. You should also map the debug port 9009. + +``` +docker run -p 9009:9009 -p 8080:8080 -p 4848:4848 glassfish startserv --debug +``` + +Then connect your debugger to the port 9009 on `localhost`. + +If you need suspend GlassFish startup until you connect the debugger, use the `--suspend` argument instead: + +``` +docker run -p 9009:9009 -p 8080:8080 -p 4848:4848 glassfish startserv --suspend +``` + +## Environment variables + +The following environment variables can be set to configure GlassFish Server: + +* `AS_ADMIN_MASTERPASSWORD` - to change the default master password +* `AS_ADMIN_PASSWORD` - to change the default admin password + +The following environment variables are read-only and can be used in derived Docker images or scripts: + +* `AS_PASSWORD_FILE` - path to the password file with the admin password. It's applied by default to any asadmin command +* `AS_ADMIN_USER` - name of the admin user. It's applied by default to any asadmin command +* `PATH_GF_HOME` - directory of the GlassFish installation. Also the default working directory +* `PATH_GF_SERVER_LOG` - path to the server log file + +## Additional configuration + +It's possible to specify custom commands to run in the Docker container before GlassFish server starts. The following methods are supported: + +* `${PATH_GF_HOME}/custom/init.sh` - Execute any `bash` script, which can execute admin commands via the `asadmin` command line tool +* `${PATH_GF_HOME}/custom/init.asadmin` - Execute asadmin commands directly + +If both of the above scripts are present, they are executed in this order: + +1. `init.sh` +2. `init.asadmin` + +However, always consider to executing any asadmin configuration commands during build, because configuring the server at container startup will prolong the startup time. + +### Execute asadmin commands before server startup + +Just create a file `${PATH_GF_HOME}/custom/init.asadmin` (`/opt/glassfish7/custom/init.asadmin`), the commands will be executed before GlassFish server starts. + +Within the `init.asadmin` file, you can specify any asadmin command. Most of the commands require that the server is running, so you'll need to start the server first, run the configuration commands, and then stop the server. + +For example, to start GlassFish, increase the maximum amount of threads, and then stop it, the `init.asadmin` file can contain: + +``` +start-domain +set configs.config.server-config.thread-pools.thread-pool.http-thread-pool.max-thread-pool-size=1000 +stop-domain +``` + +You can provide the file by mounting its directory to the `/opt/glassfish7/custom` directory in the container when running the container: + +``` +docker run -v ./custom:/opt/glassfish7/custom -p 8080:8080 -ti glassfish +``` + +### Execute a `bash` script before server startup + +Just create a Bash script `${PATH_GF_HOME}/custom/init.sh` (`/opt/glassfish7/custom/init.sh`), it will be executed before GlassFish server starts. + +Within the `init.sh` script, you can run any asadmin command, with `asadmin --interactive=false multimode COMMAND`. Most of the commands require that the server is running, so you'll need to start the server first, run the configuration commands, and then stop the server. If you need to run multiple commands, we recomment running asadmin commands in a single "multimode" asadmin execution to run them faster, with commands provided either on standard input or in a separate file via the `asadmin --interactive=false multimode -f` option. + +---- + +**NOTE:** If you only need to execute `asadmin` commands before server startup, it's easier to use the init.asadmin script to execute them directly, without a `bash` script. + +---- + +For example, to start GlassFish, increase the maximum amount of threads, and then stop it, the `init.sh` script can contain: + +``` +echo "start-domain +set configs.config.server-config.thread-pools.thread-pool.http-thread-pool.max-thread-pool-size=1000 +stop-domain" | asadmin --interactive=false +``` + +You can provide the script by mounting its directory to the `/opt/glassfish7/custom` directory in the container when running the container: + +``` +docker run -v ./custom:/opt/glassfish7/custom -p 8080:8080 -ti glassfish +``` + +### Execute `asadmin` commands during Docker image build + +Applying the configuration can be a lengthy operation. If you can configure the server during build time, it's recommended running asadmin configuration commands in a custom Docker image. This moves the configuration step to the image build time instead of runtime. + +To do it, simply add `RUN instructions that run `asadmin` script with the usual arguments. For example, to move the example configuration from the `init.sh` script above to Dockerfile: + +File `Dockerfile`: + +``` +FROM glassfish + +RUN printf "start-domain \n \ + set configs.config.server-config.thread-pools.thread-pool.http-thread-pool.max-thread-pool-size=1000 \n \ + stop-domain" | asadmin --interactive=false +``` + +Or you can put the asadmin commands into a separate file and run it using `asadmin --interactive=false multimode -f`. For example: + +File `commands.asadmin`: + +``` +start-domain +set configs.config.server-config.thread-pools.thread-pool.http-thread-pool.max-thread-pool-size=1000 +stop-domain +``` + +File `Dockerfile`: + +``` +FROM glassfish + +COPY commands.asadmin commands.asadmin + +RUN asadmin --interactive=false multimode -f commands.asadmin +``` + +## Examples of advanced usage + +Let's try something more complicated. + +* To modify startup arguments for GlassFish, just add `startserv` to the command line and then add any arguments supported by the `asadmin start-domain` command. The `startserv` script is an alias to the `asadmin start-domain` command but starts GlassFish in a more efficient way that is more suitable in Docker container. For example, to start in debug mode with a custom domain, run: + +```bash +docker run glassfish startserv --debug mydomain +``` + +* Environment variable `AS_TRACE=true` enables tracing of the GlassFish startup. It is useful when the server doesn't start without any useful logs. + +* `docker run` with the `--user` argument configures explicit user id for the container. It can be useful for K8S containers. + +* `docker run` with `-d` starts the container as a daemon, so the shell doesn't print logs and finishes. Docker then returns the container id which you can use for further commands. + +```bash +docker run -d glassfish +``` + +Example of running a Docker container in background, view the logs, and then stop it (with debug enabled, trace logging, and user `1000` convenient for Kubernetes ): + +```bash +docker run -d -e AS_TRACE=true --user 1000 glassfish startserv --debug=true +5a11f2fe1a9dd1569974de913a181847aa22165b5015ab20b271b08a27426e72 + +docker logs 5a11f2fe1a9dd1569974de913a181847aa22165b5015ab20b271b08a27426e72 +... + +docker stop 5a11f2fe1a9dd1569974de913a181847aa22165b5015ab20b271b08a27426e72 +``` + +## 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. + +If you want to run more complicated tests, the good path is to + +1. Write a singleton managing the GlassFish Docker Container or the whole test environment. +2. Write your own Junit5 extension which would start the container before your test and ensure that everything stops after the test including failures. +3. You can also implement direct access to the virtual network, containers, so you can change the environment configuration in between tests and simulate network failures, etc. + +```java +@Testcontainers +public class WelcomePageITest { + + @Container + private final GenericContainer server = new GenericContainer<>("glassfish:7.1.0").withExposedPorts(8080); + + @Test + void getRoot() throws Exception { + URL url = new URL("http://localhost:" + server.getMappedPort(8080) + "/"); + StringBuilder content = new StringBuilder(); + HttpURLConnection connection = (HttpURLConnection) url.openConnection(); + try { + connection.setRequestMethod("GET"); + try (BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream()))) { + String inputLine; + while ((inputLine = in.readLine()) != null) { + content.append(inputLine); + } + } + } finally { + connection.disconnect(); + } + assertThat(content.toString(), stringContainsInOrder("Eclipse GlassFish", "index.html", "production-quality")); + } + +} +``` diff --git a/7.1.0/docs/github-repo b/7.1.0/docs/github-repo new file mode 100644 index 0000000..82e2a5f --- /dev/null +++ b/7.1.0/docs/github-repo @@ -0,0 +1 @@ +https://github.com/eclipse-ee4j/glassfish.docker diff --git a/7.1.0/docs/license.md b/7.1.0/docs/license.md new file mode 100644 index 0000000..ae1a2d5 --- /dev/null +++ b/7.1.0/docs/license.md @@ -0,0 +1,262 @@ +# Eclipse Public License - v 2.0 + +THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. + +1. DEFINITIONS + +"Contribution" means: + +a) in the case of the initial Contributor, the initial content + + Distributed under this Agreement, and + +b) in the case of each subsequent Contributor: + + i) changes to the Program, and + ii) additions to the Program; + +where such changes and/or additions to the Program originate from and are Distributed by that particular Contributor. A Contribution "originates" from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include changes or additions to the Program that are not Modified Works. + +"Contributor" means any person or entity that Distributes the Program. + +"Licensed Patents" mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program. + +"Program" means the Contributions Distributed in accordance with this Agreement. + +"Recipient" means anyone who receives the Program under this Agreement or any Secondary License (as applicable), including Contributors. + +"Derivative Works" shall mean any work, whether in Source Code or other form, that is based on (or derived from) the Program and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. + +"Modified Works" shall mean any work in Source Code or other form that results from an addition to, deletion from, or modification of the contents of the Program, including, for purposes of clarity any new file in Source Code form that contains any contents of the Program. Modified Works shall not include works that contain only declarations, interfaces, types, classes, structures, or files of the Program solely in each case in order to link to, bind by name, or subclass the Program or Modified Works thereof. + +"Distribute" means the acts of a) distributing or b) making available in any manner that enables the transfer of a copy. + +"Source Code" means the form of a Program preferred for making modifications, including but not limited to software source code, documentation source, and configuration files. + +"Secondary License" means either the GNU General Public License, Version 2.0, or any later versions of that license, including any exceptions or additional permissions as identified by the initial Contributor. + +1. GRANT OF RIGHTS + +a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, Distribute and sublicense the Contribution of such Contributor, if any, and such Derivative Works. + +b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in Source Code or other form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder. + +c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to Distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program. + +d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement. + +e) Notwithstanding the terms of any Secondary License, no Contributor makes additional grants to any Recipient (other than those set forth in this Agreement) as a result of such Recipient's receipt of the Program under the terms of a Secondary License (if permitted under the terms of Section 3). + +1. REQUIREMENTS + +3.1 If a Contributor Distributes the Program in any form, then: + +a) the Program must also be made available as Source Code, in accordance with section 3.2, and the Contributor must accompany the Program with a statement that the Source Code for the Program is available under this Agreement, and informs Recipients how to obtain it in a reasonable manner on or through a medium customarily used for software exchange; and + +b) the Contributor may Distribute the Program under a license different than this Agreement, provided that such license: + + i) effectively disclaims on behalf of all other Contributors all + warranties and conditions, express and implied, including + warranties or conditions of title and non-infringement, and + implied warranties or conditions of merchantability and fitness + for a particular purpose; + + ii) effectively excludes on behalf of all other Contributors all + liability for damages, including direct, indirect, special, + incidental and consequential damages, such as lost profits; + + iii) does not attempt to limit or alter the recipients' rights + in the Source Code under section 3.2; and + + iv) requires any subsequent distribution of the Program by any + party to be under a license that satisfies the requirements + of this section 3. + +3.2 When the Program is Distributed as Source Code: + +a) it must be made available under this Agreement, or if the Program (i) is combined with other material in a separate file or files made available under a Secondary License, and (ii) the initial Contributor attached to the Source Code the notice described in Exhibit A of this Agreement, then the Program may be made available under the terms of such Secondary Licenses, and + +b) a copy of this Agreement must be included with each copy of the Program. + +3.3 Contributors may not remove or alter any copyright, patent, trademark, attribution notices, disclaimers of warranty, or limitations of liability ("notices") contained within the Program from any copy of the Program which they Distribute, provided that Contributors may add their own appropriate notices. + +1. COMMERCIAL DISTRIBUTION + +Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense. + +For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages. + +1. NO WARRANTY + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement, including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations. + +1. DISCLAIMER OF LIABILITY + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +1. GENERAL + +If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable. + +If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed. + +All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive. + +Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be Distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to Distribute the Program (including its Contributions) under the new version. + +Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved. Nothing in this Agreement is intended to be enforceable by any entity that is not a Contributor or Recipient. No third-party beneficiary rights are created under this Agreement. + +Exhibit A - Form of Secondary Licenses Notice + +"This Source Code may also be made available under the following Secondary Licenses when the conditions for such availability set forth in the Eclipse Public License, v. 2.0 are satisfied: {name license(s), version(s), and exceptions or additional permissions here}." + +Simply including a copy of this Agreement, including this Exhibit A is not sufficient to license the Source Code under Secondary Licenses. + +If it is not possible or desirable to put the notice in a particular file, then You may include the notice in a location (such as a LICENSE file in a relevant directory) where a recipient would be likely to look for such a notice. + +You may add additional accurate notices of copyright ownership. + +--- + +## The GNU General Public License (GPL) Version 2, June 1991 + +Copyright (C) 1989, 1991 Free Software Foundation, Inc. 51 Franklin Street, Fifth Floor Boston, MA 02110-1335 USA + +Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. + +Preamble + +The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Library General Public License instead.) You can apply it to your programs, too. + +When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. + +To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it. + +For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. + +We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software. + +Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations. + +Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. + +The precise terms and conditions for copying, distribution and modification follow. + +TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + +1. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. + +1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program. + +You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. + +1. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. + + c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. + +1. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. + +If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. + +1. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. + +2. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. + +3. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. + +4. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. + +This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. + +1. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. + +2. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. + +1. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. + +NO WARRANTY + +1. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + +2. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +END OF TERMS AND CONDITIONS + +How to Apply These Terms to Your New Programs + +If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. + +To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. + + One line to give the program's name and a brief idea of what it does. + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type + `show w'. This is free software, and you are welcome to redistribute + it under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and`show c' should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than `show w' and`show c'; they could even be mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + program `Gnomovision' (which makes passes at compilers) written by + James Hacker. + + signature of Ty Coon, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Library General Public License instead of this License. + +--- + +## CLASSPATH EXCEPTION + +Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and conditions of the GNU General Public License version 2 cover the whole combination. + +As a special exception, the copyright holders of this library give you permission to link this library with independent modules to produce an executable, regardless of the license terms of these independent modules, and to copy and distribute the resulting executable under terms of your choice, provided that you also meet, for each linked independent module, the terms and conditions of the license of that module. An independent module is a module which is not derived from or based on this library. If you modify this library, you may extend this exception to your version of the library, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/7.1.0/docs/logo.svg b/7.1.0/docs/logo.svg new file mode 100644 index 0000000..55b2329 --- /dev/null +++ b/7.1.0/docs/logo.svg @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + \ No newline at end of file diff --git a/7.1.0/docs/maintainer.md b/7.1.0/docs/maintainer.md new file mode 100644 index 0000000..e727ff0 --- /dev/null +++ b/7.1.0/docs/maintainer.md @@ -0,0 +1 @@ +../.common-templates/maintainer-community.md \ No newline at end of file diff --git a/pom.xml b/pom.xml index c2f7293..14db05b 100644 --- a/pom.xml +++ b/pom.xml @@ -11,8 +11,8 @@ Eclipse Glassfish Docker Image Distribution - eclipse-temurin:17.0.17_10-jdk - 7.0.25 + eclipse-temurin:21-jdk + 7.1.0 glassfish ${glassfish.version} ${docker.glassfish.repository}:${docker.glassfish.tag} diff --git a/src/main/resources/docker-entrypoint.sh b/src/main/resources/docker-entrypoint.sh index cf96f56..7d15a85 100755 --- a/src/main/resources/docker-entrypoint.sh +++ b/src/main/resources/docker-entrypoint.sh @@ -36,22 +36,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 diff --git a/src/main/resources/docs/content.md b/src/main/resources/docs/content.md index d0b6749..fdc6a05 100644 --- a/src/main/resources/docs/content.md +++ b/src/main/resources/docs/content.md @@ -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. @@ -241,55 +219,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. diff --git a/src/test/java/org/glassfish/main/distributions/docker/RunembeddedIT.java b/src/test/java/org/glassfish/main/distributions/docker/RunembeddedIT.java deleted file mode 100644 index 1fed4e6..0000000 --- a/src/test/java/org/glassfish/main/distributions/docker/RunembeddedIT.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (c) 2024,2025 Contributors to the Eclipse Foundation. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ -package org.glassfish.main.distributions.docker; - -import java.net.http.HttpResponse; - -import org.junit.jupiter.api.Test; -import org.testcontainers.containers.GenericContainer; -import org.testcontainers.containers.output.OutputFrame.OutputType; -import org.testcontainers.junit.jupiter.Container; -import org.testcontainers.junit.jupiter.Testcontainers; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.glassfish.main.distributions.docker.HttpUtilities.getEmbeddedDefaultRoot; - -/** - * - */ -@Testcontainers -public class RunembeddedIT { - - @SuppressWarnings({"rawtypes", "resource"}) - @Container - private final GenericContainer server = new GenericContainer<>(System.getProperty("docker.glassfish.image")) - .withCommand("runembedded").withExposedPorts(8080).withLogConsumer(o -> { - // FIXME: If we don't use the interactive terminal, spams STDOUT. To be fixed in 7.0.19+. - if (o.getType() == OutputType.STDERR) { - System.err.print("GF: " + o.getUtf8String()); - } - }); - - @Test - void rootResourceGivesNotFound() throws Exception { - final HttpResponse defaultRootResponse = getEmbeddedDefaultRoot(server); - assertEquals(404, defaultRootResponse.statusCode(), "Response status code"); - } -} From b3ca4c728755e164df7276e59648673d104da1d6 Mon Sep 17 00:00:00 2001 From: Ondro Mihalyi Date: Fri, 9 Jan 2026 20:24:03 +0100 Subject: [PATCH 2/9] Moved images from root to images/server This allows adding support for different images later. --- ...-publish.yml => docker-server-publish.yml} | 4 +- {7.0.0 => images/server/7.0.0}/Dockerfile | 0 .../server/7.0.0}/docker-entrypoint.sh | 0 .../server/7.0.0}/dockerlibfile-fragment.txt | 0 {7.0.1 => images/server/7.0.1}/Dockerfile | 0 .../server/7.0.1}/docker-entrypoint.sh | 0 .../server/7.0.1}/dockerlibfile-fragment.txt | 0 {7.0.10 => images/server/7.0.10}/Dockerfile | 0 .../server/7.0.10}/docker-entrypoint.sh | 0 .../server/7.0.10}/dockerlibfile-fragment.txt | 0 .../server/7.0.10}/docs/README-short.txt | 0 .../server/7.0.10}/docs/content.md | 0 .../server/7.0.10}/docs/github-repo | 0 .../server/7.0.10}/docs/license.md | 0 .../server/7.0.10}/docs/logo.svg | 0 .../server/7.0.10}/docs/maintainer.md | 0 {7.0.11 => images/server/7.0.11}/Dockerfile | 0 .../server/7.0.11}/docker-entrypoint.sh | 0 .../server/7.0.11}/dockerlibfile-fragment.txt | 0 .../server/7.0.11}/docs/README-short.txt | 0 .../server/7.0.11}/docs/content.md | 0 .../server/7.0.11}/docs/github-repo | 0 .../server/7.0.11}/docs/license.md | 0 {7.0.9 => images/server/7.0.11}/docs/logo.svg | 0 .../server/7.0.11}/docs/maintainer.md | 0 {7.0.12 => images/server/7.0.12}/Dockerfile | 0 .../server/7.0.12}/docker-entrypoint.sh | 0 .../server/7.0.12}/dockerlibfile-fragment.txt | 0 .../server/7.0.12}/docs/README-short.txt | 0 .../server/7.0.12}/docs/content.md | 0 .../server/7.0.12}/docs/github-repo | 0 .../server/7.0.12}/docs/license.md | 0 {7.0.8 => images/server/7.0.12}/docs/logo.svg | 0 .../server/7.0.12}/docs/maintainer.md | 0 {7.0.13 => images/server/7.0.13}/Dockerfile | 0 .../server/7.0.13}/docker-entrypoint.sh | 0 .../server/7.0.13}/dockerlibfile-fragment.txt | 0 .../server/7.0.13}/docs/README-short.txt | 0 .../server/7.0.13}/docs/content.md | 0 .../server/7.0.13}/docs/github-repo | 0 .../server/7.0.13}/docs/license.md | 0 .../server/7.0.13}/docs/logo.svg | 0 .../server/7.0.13}/docs/maintainer.md | 0 {7.0.14 => images/server/7.0.14}/Dockerfile | 0 .../server/7.0.14}/docker-entrypoint.sh | 0 .../server/7.0.14}/dockerlibfile-fragment.txt | 0 .../server/7.0.14}/docs/README-short.txt | 0 .../server/7.0.14}/docs/content.md | 0 .../server/7.0.14}/docs/github-repo | 0 .../server/7.0.14}/docs/license.md | 0 .../server/7.0.14}/docs/logo.svg | 0 .../server/7.0.14}/docs/maintainer.md | 0 {7.0.15 => images/server/7.0.15}/Dockerfile | 0 .../server/7.0.15}/docker-entrypoint.sh | 0 .../server/7.0.15}/dockerlibfile-fragment.txt | 0 .../server/7.0.15}/docs/README-short.txt | 0 .../server/7.0.15}/docs/content.md | 0 .../server/7.0.15}/docs/github-repo | 0 .../server/7.0.15}/docs/license.md | 0 .../server/7.0.15}/docs/logo.svg | 0 .../server/7.0.15}/docs/maintainer.md | 0 {7.0.16 => images/server/7.0.16}/Dockerfile | 0 .../server/7.0.16}/docker-entrypoint.sh | 0 .../server/7.0.16}/dockerlibfile-fragment.txt | 0 .../server/7.0.16}/docs/README-short.txt | 0 .../server/7.0.16}/docs/content.md | 0 .../server/7.0.16}/docs/github-repo | 0 .../server/7.0.16}/docs/license.md | 0 .../server/7.0.16}/docs/logo.svg | 0 .../server/7.0.16}/docs/maintainer.md | 0 {7.0.17 => images/server/7.0.17}/Dockerfile | 0 .../server/7.0.17}/docker-entrypoint.sh | 0 .../server/7.0.17}/dockerlibfile-fragment.txt | 0 .../server/7.0.17}/docs/README-short.txt | 0 .../server/7.0.17}/docs/content.md | 0 .../server/7.0.17}/docs/github-repo | 0 .../server/7.0.17}/docs/license.md | 0 .../server/7.0.17}/docs/logo.svg | 0 .../server/7.0.17}/docs/maintainer.md | 0 {7.0.18 => images/server/7.0.18}/Dockerfile | 0 .../server/7.0.18}/docker-entrypoint.sh | 0 .../server/7.0.18}/dockerlibfile-fragment.txt | 0 .../server/7.0.18}/docs/README-short.txt | 0 .../server/7.0.18}/docs/content.md | 0 .../server/7.0.18}/docs/github-repo | 0 .../server/7.0.18}/docs/license.md | 0 .../server/7.0.18}/docs/logo.svg | 0 .../server/7.0.18}/docs/maintainer.md | 0 {7.0.19 => images/server/7.0.19}/Dockerfile | 0 .../server/7.0.19}/docker-entrypoint.sh | 0 .../server/7.0.19}/dockerlibfile-fragment.txt | 0 .../server/7.0.19}/docs/README-short.txt | 0 .../server/7.0.19}/docs/content.md | 0 .../server/7.0.19}/docs/github-repo | 0 .../server/7.0.19}/docs/license.md | 0 .../server/7.0.19}/docs/logo.svg | 0 .../server/7.0.19}/docs/maintainer.md | 0 {7.0.2 => images/server/7.0.2}/Dockerfile | 0 .../server/7.0.2}/docker-entrypoint.sh | 0 .../server/7.0.2}/dockerlibfile-fragment.txt | 0 {7.0.20 => images/server/7.0.20}/Dockerfile | 0 .../server/7.0.20}/docker-entrypoint.sh | 0 .../server/7.0.20}/dockerlibfile-fragment.txt | 0 .../server/7.0.20}/docs/README-short.txt | 0 .../server/7.0.20}/docs/content.md | 0 .../server/7.0.20}/docs/github-repo | 0 .../server/7.0.20}/docs/license.md | 0 .../server/7.0.20}/docs/logo.svg | 0 .../server/7.0.20}/docs/maintainer.md | 0 {7.0.21 => images/server/7.0.21}/Dockerfile | 0 .../server/7.0.21}/docker-entrypoint.sh | 0 .../server/7.0.21}/dockerlibfile-fragment.txt | 0 .../server/7.0.21}/docs/README-short.txt | 0 .../server/7.0.21}/docs/content.md | 0 .../server/7.0.21}/docs/github-repo | 0 .../server/7.0.21}/docs/license.md | 0 .../server/7.0.21}/docs/logo.svg | 0 .../server/7.0.21}/docs/maintainer.md | 0 {7.0.22 => images/server/7.0.22}/Dockerfile | 0 .../server/7.0.22}/docker-entrypoint.sh | 0 .../server/7.0.22}/dockerlibfile-fragment.txt | 0 .../server/7.0.22}/docs/README-short.txt | 0 .../server/7.0.22}/docs/content.md | 0 .../server/7.0.22}/docs/github-repo | 0 .../server/7.0.22}/docs/license.md | 0 .../server/7.0.22}/docs/logo.svg | 0 .../server/7.0.22}/docs/maintainer.md | 0 {7.0.23 => images/server/7.0.23}/Dockerfile | 0 .../server/7.0.23}/docker-entrypoint.sh | 0 .../server/7.0.23}/dockerlibfile-fragment.txt | 0 .../server/7.0.23}/docs/README-short.txt | 0 .../server/7.0.23}/docs/content.md | 0 .../server/7.0.23}/docs/github-repo | 0 .../server/7.0.23}/docs/license.md | 0 .../server/7.0.23}/docs/logo.svg | 0 .../server/7.0.23}/docs/maintainer.md | 0 {7.0.24 => images/server/7.0.24}/Dockerfile | 0 .../server/7.0.24}/docker-entrypoint.sh | 0 .../server/7.0.24}/dockerlibfile-fragment.txt | 0 .../server/7.0.24}/docs/README-short.txt | 0 .../server/7.0.24}/docs/content.md | 0 .../server/7.0.24}/docs/github-repo | 0 .../server/7.0.24}/docs/license.md | 0 {7.1.0 => images/server/7.0.24}/docs/logo.svg | 0 .../server/7.0.24}/docs/maintainer.md | 0 {7.0.25 => images/server/7.0.25}/Dockerfile | 0 .../server/7.0.25}/docker-entrypoint.sh | 0 .../server/7.0.25}/dockerlibfile-fragment.txt | 0 .../server/7.0.25}/docs/README-short.txt | 0 .../server/7.0.25}/docs/content.md | 0 .../server/7.0.25}/docs/github-repo | 0 .../server/7.0.25}/docs/license.md | 0 .../server/7.0.25}/docs/logo.svg | 0 .../server/7.0.25}/docs/maintainer.md | 0 {7.0.3 => images/server/7.0.3}/Dockerfile | 0 .../server/7.0.3}/docker-entrypoint.sh | 0 .../server/7.0.3}/dockerlibfile-fragment.txt | 0 {7.0.4 => images/server/7.0.4}/Dockerfile | 0 .../server/7.0.4}/docker-entrypoint.sh | 0 .../server/7.0.4}/dockerlibfile-fragment.txt | 0 {7.0.5 => images/server/7.0.5}/Dockerfile | 0 .../server/7.0.5}/docker-entrypoint.sh | 0 .../server/7.0.5}/dockerlibfile-fragment.txt | 0 {7.0.6 => images/server/7.0.6}/Dockerfile | 0 .../server/7.0.6}/docker-entrypoint.sh | 0 .../server/7.0.6}/dockerlibfile-fragment.txt | 0 {7.0.7 => images/server/7.0.7}/Dockerfile | 0 .../server/7.0.7}/docker-entrypoint.sh | 0 .../server/7.0.7}/dockerlibfile-fragment.txt | 0 {7.0.8 => images/server/7.0.8}/Dockerfile | 0 .../server/7.0.8}/docker-entrypoint.sh | 0 .../server/7.0.8}/dockerlibfile-fragment.txt | 0 .../server/7.0.8}/docs/README-short.txt | 0 .../server/7.0.8}/docs/content.md | 0 .../server/7.0.8}/docs/github-repo | 0 .../server/7.0.8}/docs/license.md | 0 {7.0.12 => images/server/7.0.8}/docs/logo.svg | 0 .../server/7.0.8}/docs/maintainer.md | 0 {7.0.9 => images/server/7.0.9}/Dockerfile | 0 .../server/7.0.9}/docker-entrypoint.sh | 0 .../server/7.0.9}/dockerlibfile-fragment.txt | 0 .../server/7.0.9}/docs/README-short.txt | 0 .../server/7.0.9}/docs/content.md | 0 .../server/7.0.9}/docs/github-repo | 0 .../server/7.0.9}/docs/license.md | 0 {7.0.11 => images/server/7.0.9}/docs/logo.svg | 0 .../server/7.0.9}/docs/maintainer.md | 0 {7.1.0 => images/server/7.1.0}/Dockerfile | 17 +++--- .../server/7.1.0}/docker-entrypoint.sh | 0 .../server/7.1.0}/dockerlibfile-fragment.txt | 0 .../server/7.1.0}/docs/README-short.txt | 0 .../server/7.1.0}/docs/content.md | 0 .../server/7.1.0}/docs/github-repo | 0 .../server/7.1.0}/docs/license.md | 0 {7.0.24 => images/server/7.1.0}/docs/logo.svg | 0 .../server/7.1.0}/docs/maintainer.md | 0 pom.xml | 59 ++++++++++--------- .../resources/{ => images/server}/Dockerfile | 4 +- .../images/server}/docker-entrypoint.sh | 0 .../server}/dockerlibfile-fragment.txt | 0 .../images/server}/docs/README-short.txt | 0 .../resources/images/server}/docs/content.md | 26 ++++---- .../resources/images/server}/docs/github-repo | 0 .../resources/images/server}/docs/license.md | 0 .../resources/images/server}/docs/logo.svg | 0 .../images/server}/docs/maintainer.md | 0 .../main/distributions/docker/AsadminIT.java | 2 +- .../docker/ChangePasswordsIT.java | 2 +- .../main/distributions/docker/DefaultIT.java | 2 +- .../distributions/docker/StartServIT.java | 2 +- 210 files changed, 60 insertions(+), 58 deletions(-) rename .github/workflows/{docker-publish.yml => docker-server-publish.yml} (93%) rename {7.0.0 => images/server/7.0.0}/Dockerfile (100%) rename {7.0.7 => images/server/7.0.0}/docker-entrypoint.sh (100%) rename {7.0.0 => images/server/7.0.0}/dockerlibfile-fragment.txt (100%) rename {7.0.1 => images/server/7.0.1}/Dockerfile (100%) rename {7.0.6 => images/server/7.0.1}/docker-entrypoint.sh (100%) rename {7.0.1 => images/server/7.0.1}/dockerlibfile-fragment.txt (100%) rename {7.0.10 => images/server/7.0.10}/Dockerfile (100%) rename {7.0.9 => images/server/7.0.10}/docker-entrypoint.sh (100%) rename {7.0.10 => images/server/7.0.10}/dockerlibfile-fragment.txt (100%) rename {src/main/resources => images/server/7.0.10}/docs/README-short.txt (100%) rename {7.0.10 => images/server/7.0.10}/docs/content.md (100%) rename {7.0.9 => images/server/7.0.10}/docs/github-repo (100%) rename {src/main/resources => images/server/7.0.10}/docs/license.md (100%) rename {src/main/resources => images/server/7.0.10}/docs/logo.svg (100%) rename {src/main/resources => images/server/7.0.10}/docs/maintainer.md (100%) rename {7.0.11 => images/server/7.0.11}/Dockerfile (100%) rename {7.0.8 => images/server/7.0.11}/docker-entrypoint.sh (100%) rename {7.0.11 => images/server/7.0.11}/dockerlibfile-fragment.txt (100%) rename {7.1.0 => images/server/7.0.11}/docs/README-short.txt (100%) rename {7.0.11 => images/server/7.0.11}/docs/content.md (100%) rename {7.0.8 => images/server/7.0.11}/docs/github-repo (100%) rename {7.1.0 => images/server/7.0.11}/docs/license.md (100%) rename {7.0.9 => images/server/7.0.11}/docs/logo.svg (100%) rename {7.1.0 => images/server/7.0.11}/docs/maintainer.md (100%) rename {7.0.12 => images/server/7.0.12}/Dockerfile (100%) rename {7.0.17 => images/server/7.0.12}/docker-entrypoint.sh (100%) rename {7.0.12 => images/server/7.0.12}/dockerlibfile-fragment.txt (100%) rename {7.0.9 => images/server/7.0.12}/docs/README-short.txt (100%) rename {7.0.12 => images/server/7.0.12}/docs/content.md (100%) rename {7.0.17 => images/server/7.0.12}/docs/github-repo (100%) rename {7.0.9 => images/server/7.0.12}/docs/license.md (100%) rename {7.0.8 => images/server/7.0.12}/docs/logo.svg (100%) rename {7.0.9 => images/server/7.0.12}/docs/maintainer.md (100%) rename {7.0.13 => images/server/7.0.13}/Dockerfile (100%) rename {7.0.16 => images/server/7.0.13}/docker-entrypoint.sh (100%) rename {7.0.13 => images/server/7.0.13}/dockerlibfile-fragment.txt (100%) rename {7.0.8 => images/server/7.0.13}/docs/README-short.txt (100%) rename {7.0.13 => images/server/7.0.13}/docs/content.md (100%) rename {7.0.16 => images/server/7.0.13}/docs/github-repo (100%) rename {7.0.8 => images/server/7.0.13}/docs/license.md (100%) rename {7.0.23 => images/server/7.0.13}/docs/logo.svg (100%) rename {7.0.8 => images/server/7.0.13}/docs/maintainer.md (100%) rename {7.0.14 => images/server/7.0.14}/Dockerfile (100%) rename {7.0.15 => images/server/7.0.14}/docker-entrypoint.sh (100%) rename {7.0.14 => images/server/7.0.14}/dockerlibfile-fragment.txt (100%) rename {7.0.25 => images/server/7.0.14}/docs/README-short.txt (100%) rename {7.0.14 => images/server/7.0.14}/docs/content.md (100%) rename {7.0.15 => images/server/7.0.14}/docs/github-repo (100%) rename {7.0.25 => images/server/7.0.14}/docs/license.md (100%) rename {7.0.22 => images/server/7.0.14}/docs/logo.svg (100%) rename {7.0.25 => images/server/7.0.14}/docs/maintainer.md (100%) rename {7.0.15 => images/server/7.0.15}/Dockerfile (100%) rename {7.0.14 => images/server/7.0.15}/docker-entrypoint.sh (100%) rename {7.0.15 => images/server/7.0.15}/dockerlibfile-fragment.txt (100%) rename {7.0.24 => images/server/7.0.15}/docs/README-short.txt (100%) rename {7.0.15 => images/server/7.0.15}/docs/content.md (100%) rename {7.0.14 => images/server/7.0.15}/docs/github-repo (100%) rename {7.0.24 => images/server/7.0.15}/docs/license.md (100%) rename {7.0.21 => images/server/7.0.15}/docs/logo.svg (100%) rename {7.0.24 => images/server/7.0.15}/docs/maintainer.md (100%) rename {7.0.16 => images/server/7.0.16}/Dockerfile (100%) rename {7.0.13 => images/server/7.0.16}/docker-entrypoint.sh (100%) rename {7.0.16 => images/server/7.0.16}/dockerlibfile-fragment.txt (100%) rename {7.0.23 => images/server/7.0.16}/docs/README-short.txt (100%) rename {7.0.16 => images/server/7.0.16}/docs/content.md (100%) rename {7.0.13 => images/server/7.0.16}/docs/github-repo (100%) rename {7.0.23 => images/server/7.0.16}/docs/license.md (100%) rename {7.0.20 => images/server/7.0.16}/docs/logo.svg (100%) rename {7.0.23 => images/server/7.0.16}/docs/maintainer.md (100%) rename {7.0.17 => images/server/7.0.17}/Dockerfile (100%) rename {7.0.12 => images/server/7.0.17}/docker-entrypoint.sh (100%) rename {7.0.17 => images/server/7.0.17}/dockerlibfile-fragment.txt (100%) rename {7.0.22 => images/server/7.0.17}/docs/README-short.txt (100%) rename {7.0.17 => images/server/7.0.17}/docs/content.md (100%) rename {7.0.12 => images/server/7.0.17}/docs/github-repo (100%) rename {7.0.22 => images/server/7.0.17}/docs/license.md (100%) rename {7.0.19 => images/server/7.0.17}/docs/logo.svg (100%) rename {7.0.22 => images/server/7.0.17}/docs/maintainer.md (100%) rename {7.0.18 => images/server/7.0.18}/Dockerfile (100%) rename {7.0.20 => images/server/7.0.18}/docker-entrypoint.sh (100%) rename {7.0.18 => images/server/7.0.18}/dockerlibfile-fragment.txt (100%) rename {7.0.21 => images/server/7.0.18}/docs/README-short.txt (100%) rename {7.0.18 => images/server/7.0.18}/docs/content.md (100%) rename {src/main/resources => images/server/7.0.18}/docs/github-repo (100%) rename {7.0.21 => images/server/7.0.18}/docs/license.md (100%) rename {7.0.18 => images/server/7.0.18}/docs/logo.svg (100%) rename {7.0.21 => images/server/7.0.18}/docs/maintainer.md (100%) rename {7.0.19 => images/server/7.0.19}/Dockerfile (100%) rename {7.0.19 => images/server/7.0.19}/docker-entrypoint.sh (100%) rename {7.0.19 => images/server/7.0.19}/dockerlibfile-fragment.txt (100%) rename {7.0.20 => images/server/7.0.19}/docs/README-short.txt (100%) rename {7.0.19 => images/server/7.0.19}/docs/content.md (100%) rename {7.1.0 => images/server/7.0.19}/docs/github-repo (100%) rename {7.0.20 => images/server/7.0.19}/docs/license.md (100%) rename {7.0.17 => images/server/7.0.19}/docs/logo.svg (100%) rename {7.0.20 => images/server/7.0.19}/docs/maintainer.md (100%) rename {7.0.2 => images/server/7.0.2}/Dockerfile (100%) rename {7.0.5 => images/server/7.0.2}/docker-entrypoint.sh (100%) rename {7.0.2 => images/server/7.0.2}/dockerlibfile-fragment.txt (100%) rename {7.0.20 => images/server/7.0.20}/Dockerfile (100%) rename {7.0.18 => images/server/7.0.20}/docker-entrypoint.sh (100%) rename {7.0.20 => images/server/7.0.20}/dockerlibfile-fragment.txt (100%) rename {7.0.19 => images/server/7.0.20}/docs/README-short.txt (100%) rename {7.0.20 => images/server/7.0.20}/docs/content.md (100%) rename {7.0.25 => images/server/7.0.20}/docs/github-repo (100%) rename {7.0.19 => images/server/7.0.20}/docs/license.md (100%) rename {7.0.16 => images/server/7.0.20}/docs/logo.svg (100%) rename {7.0.19 => images/server/7.0.20}/docs/maintainer.md (100%) rename {7.0.21 => images/server/7.0.21}/Dockerfile (100%) rename {7.0.25 => images/server/7.0.21}/docker-entrypoint.sh (100%) rename {7.0.21 => images/server/7.0.21}/dockerlibfile-fragment.txt (100%) rename {7.0.18 => images/server/7.0.21}/docs/README-short.txt (100%) rename {7.0.21 => images/server/7.0.21}/docs/content.md (100%) rename {7.0.24 => images/server/7.0.21}/docs/github-repo (100%) rename {7.0.18 => images/server/7.0.21}/docs/license.md (100%) rename {7.0.15 => images/server/7.0.21}/docs/logo.svg (100%) rename {7.0.18 => images/server/7.0.21}/docs/maintainer.md (100%) rename {7.0.22 => images/server/7.0.22}/Dockerfile (100%) rename {7.0.24 => images/server/7.0.22}/docker-entrypoint.sh (100%) rename {7.0.22 => images/server/7.0.22}/dockerlibfile-fragment.txt (100%) rename {7.0.17 => images/server/7.0.22}/docs/README-short.txt (100%) rename {7.0.22 => images/server/7.0.22}/docs/content.md (100%) rename {7.0.23 => images/server/7.0.22}/docs/github-repo (100%) rename {7.0.17 => images/server/7.0.22}/docs/license.md (100%) rename {7.0.14 => images/server/7.0.22}/docs/logo.svg (100%) rename {7.0.17 => images/server/7.0.22}/docs/maintainer.md (100%) rename {7.0.23 => images/server/7.0.23}/Dockerfile (100%) rename {7.0.23 => images/server/7.0.23}/docker-entrypoint.sh (100%) rename {7.0.23 => images/server/7.0.23}/dockerlibfile-fragment.txt (100%) rename {7.0.16 => images/server/7.0.23}/docs/README-short.txt (100%) rename {7.0.23 => images/server/7.0.23}/docs/content.md (100%) rename {7.0.22 => images/server/7.0.23}/docs/github-repo (100%) rename {7.0.16 => images/server/7.0.23}/docs/license.md (100%) rename {7.0.13 => images/server/7.0.23}/docs/logo.svg (100%) rename {7.0.16 => images/server/7.0.23}/docs/maintainer.md (100%) rename {7.0.24 => images/server/7.0.24}/Dockerfile (100%) rename {7.0.22 => images/server/7.0.24}/docker-entrypoint.sh (100%) rename {7.0.24 => images/server/7.0.24}/dockerlibfile-fragment.txt (100%) rename {7.0.15 => images/server/7.0.24}/docs/README-short.txt (100%) rename {7.0.24 => images/server/7.0.24}/docs/content.md (100%) rename {7.0.21 => images/server/7.0.24}/docs/github-repo (100%) rename {7.0.15 => images/server/7.0.24}/docs/license.md (100%) rename {7.1.0 => images/server/7.0.24}/docs/logo.svg (100%) rename {7.0.15 => images/server/7.0.24}/docs/maintainer.md (100%) rename {7.0.25 => images/server/7.0.25}/Dockerfile (100%) rename {7.0.21 => images/server/7.0.25}/docker-entrypoint.sh (100%) rename {7.0.25 => images/server/7.0.25}/dockerlibfile-fragment.txt (100%) rename {7.0.14 => images/server/7.0.25}/docs/README-short.txt (100%) rename {7.0.25 => images/server/7.0.25}/docs/content.md (100%) rename {7.0.20 => images/server/7.0.25}/docs/github-repo (100%) rename {7.0.14 => images/server/7.0.25}/docs/license.md (100%) rename {7.0.25 => images/server/7.0.25}/docs/logo.svg (100%) rename {7.0.14 => images/server/7.0.25}/docs/maintainer.md (100%) rename {7.0.3 => images/server/7.0.3}/Dockerfile (100%) rename {7.0.4 => images/server/7.0.3}/docker-entrypoint.sh (100%) rename {7.0.3 => images/server/7.0.3}/dockerlibfile-fragment.txt (100%) rename {7.0.4 => images/server/7.0.4}/Dockerfile (100%) rename {7.0.3 => images/server/7.0.4}/docker-entrypoint.sh (100%) rename {7.0.4 => images/server/7.0.4}/dockerlibfile-fragment.txt (100%) rename {7.0.5 => images/server/7.0.5}/Dockerfile (100%) rename {7.0.2 => images/server/7.0.5}/docker-entrypoint.sh (100%) rename {7.0.5 => images/server/7.0.5}/dockerlibfile-fragment.txt (100%) rename {7.0.6 => images/server/7.0.6}/Dockerfile (100%) rename {7.0.1 => images/server/7.0.6}/docker-entrypoint.sh (100%) rename {7.0.6 => images/server/7.0.6}/dockerlibfile-fragment.txt (100%) rename {7.0.7 => images/server/7.0.7}/Dockerfile (100%) rename {7.0.0 => images/server/7.0.7}/docker-entrypoint.sh (100%) rename {7.0.7 => images/server/7.0.7}/dockerlibfile-fragment.txt (100%) rename {7.0.8 => images/server/7.0.8}/Dockerfile (100%) rename {7.0.11 => images/server/7.0.8}/docker-entrypoint.sh (100%) rename {7.0.8 => images/server/7.0.8}/dockerlibfile-fragment.txt (100%) rename {7.0.13 => images/server/7.0.8}/docs/README-short.txt (100%) rename {7.0.8 => images/server/7.0.8}/docs/content.md (100%) rename {7.0.11 => images/server/7.0.8}/docs/github-repo (100%) rename {7.0.13 => images/server/7.0.8}/docs/license.md (100%) rename {7.0.12 => images/server/7.0.8}/docs/logo.svg (100%) rename {7.0.13 => images/server/7.0.8}/docs/maintainer.md (100%) rename {7.0.9 => images/server/7.0.9}/Dockerfile (100%) rename {7.0.10 => images/server/7.0.9}/docker-entrypoint.sh (100%) rename {7.0.9 => images/server/7.0.9}/dockerlibfile-fragment.txt (100%) rename {7.0.12 => images/server/7.0.9}/docs/README-short.txt (100%) rename {7.0.9 => images/server/7.0.9}/docs/content.md (100%) rename {7.0.10 => images/server/7.0.9}/docs/github-repo (100%) rename {7.0.12 => images/server/7.0.9}/docs/license.md (100%) rename {7.0.11 => images/server/7.0.9}/docs/logo.svg (100%) rename {7.0.12 => images/server/7.0.9}/docs/maintainer.md (100%) rename {7.1.0 => images/server/7.1.0}/Dockerfile (91%) mode change 100644 => 100755 rename {src/main/resources => images/server/7.1.0}/docker-entrypoint.sh (100%) rename {7.1.0 => images/server/7.1.0}/dockerlibfile-fragment.txt (100%) rename {7.0.11 => images/server/7.1.0}/docs/README-short.txt (100%) rename {src/main/resources => images/server/7.1.0}/docs/content.md (100%) rename {7.0.19 => images/server/7.1.0}/docs/github-repo (100%) rename {7.0.11 => images/server/7.1.0}/docs/license.md (100%) rename {7.0.24 => images/server/7.1.0}/docs/logo.svg (100%) rename {7.0.11 => images/server/7.1.0}/docs/maintainer.md (100%) rename src/main/resources/{ => images/server}/Dockerfile (97%) rename {7.1.0 => src/main/resources/images/server}/docker-entrypoint.sh (100%) rename src/main/resources/{ => images/server}/dockerlibfile-fragment.txt (100%) rename {7.0.10 => src/main/resources/images/server}/docs/README-short.txt (100%) rename {7.1.0 => src/main/resources/images/server}/docs/content.md (91%) rename {7.0.18 => src/main/resources/images/server}/docs/github-repo (100%) rename {7.0.10 => src/main/resources/images/server}/docs/license.md (100%) rename {7.0.10 => src/main/resources/images/server}/docs/logo.svg (100%) rename {7.0.10 => src/main/resources/images/server}/docs/maintainer.md (100%) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-server-publish.yml similarity index 93% rename from .github/workflows/docker-publish.yml rename to .github/workflows/docker-server-publish.yml index a11f97a..cdd88be 100644 --- a/.github/workflows/docker-publish.yml +++ b/.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: @@ -54,7 +54,7 @@ jobs: - 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 diff --git a/7.0.0/Dockerfile b/images/server/7.0.0/Dockerfile similarity index 100% rename from 7.0.0/Dockerfile rename to images/server/7.0.0/Dockerfile diff --git a/7.0.7/docker-entrypoint.sh b/images/server/7.0.0/docker-entrypoint.sh similarity index 100% rename from 7.0.7/docker-entrypoint.sh rename to images/server/7.0.0/docker-entrypoint.sh diff --git a/7.0.0/dockerlibfile-fragment.txt b/images/server/7.0.0/dockerlibfile-fragment.txt similarity index 100% rename from 7.0.0/dockerlibfile-fragment.txt rename to images/server/7.0.0/dockerlibfile-fragment.txt diff --git a/7.0.1/Dockerfile b/images/server/7.0.1/Dockerfile similarity index 100% rename from 7.0.1/Dockerfile rename to images/server/7.0.1/Dockerfile diff --git a/7.0.6/docker-entrypoint.sh b/images/server/7.0.1/docker-entrypoint.sh similarity index 100% rename from 7.0.6/docker-entrypoint.sh rename to images/server/7.0.1/docker-entrypoint.sh diff --git a/7.0.1/dockerlibfile-fragment.txt b/images/server/7.0.1/dockerlibfile-fragment.txt similarity index 100% rename from 7.0.1/dockerlibfile-fragment.txt rename to images/server/7.0.1/dockerlibfile-fragment.txt diff --git a/7.0.10/Dockerfile b/images/server/7.0.10/Dockerfile similarity index 100% rename from 7.0.10/Dockerfile rename to images/server/7.0.10/Dockerfile diff --git a/7.0.9/docker-entrypoint.sh b/images/server/7.0.10/docker-entrypoint.sh similarity index 100% rename from 7.0.9/docker-entrypoint.sh rename to images/server/7.0.10/docker-entrypoint.sh diff --git a/7.0.10/dockerlibfile-fragment.txt b/images/server/7.0.10/dockerlibfile-fragment.txt similarity index 100% rename from 7.0.10/dockerlibfile-fragment.txt rename to images/server/7.0.10/dockerlibfile-fragment.txt diff --git a/src/main/resources/docs/README-short.txt b/images/server/7.0.10/docs/README-short.txt similarity index 100% rename from src/main/resources/docs/README-short.txt rename to images/server/7.0.10/docs/README-short.txt diff --git a/7.0.10/docs/content.md b/images/server/7.0.10/docs/content.md similarity index 100% rename from 7.0.10/docs/content.md rename to images/server/7.0.10/docs/content.md diff --git a/7.0.9/docs/github-repo b/images/server/7.0.10/docs/github-repo similarity index 100% rename from 7.0.9/docs/github-repo rename to images/server/7.0.10/docs/github-repo diff --git a/src/main/resources/docs/license.md b/images/server/7.0.10/docs/license.md similarity index 100% rename from src/main/resources/docs/license.md rename to images/server/7.0.10/docs/license.md diff --git a/src/main/resources/docs/logo.svg b/images/server/7.0.10/docs/logo.svg similarity index 100% rename from src/main/resources/docs/logo.svg rename to images/server/7.0.10/docs/logo.svg diff --git a/src/main/resources/docs/maintainer.md b/images/server/7.0.10/docs/maintainer.md similarity index 100% rename from src/main/resources/docs/maintainer.md rename to images/server/7.0.10/docs/maintainer.md diff --git a/7.0.11/Dockerfile b/images/server/7.0.11/Dockerfile similarity index 100% rename from 7.0.11/Dockerfile rename to images/server/7.0.11/Dockerfile diff --git a/7.0.8/docker-entrypoint.sh b/images/server/7.0.11/docker-entrypoint.sh similarity index 100% rename from 7.0.8/docker-entrypoint.sh rename to images/server/7.0.11/docker-entrypoint.sh diff --git a/7.0.11/dockerlibfile-fragment.txt b/images/server/7.0.11/dockerlibfile-fragment.txt similarity index 100% rename from 7.0.11/dockerlibfile-fragment.txt rename to images/server/7.0.11/dockerlibfile-fragment.txt diff --git a/7.1.0/docs/README-short.txt b/images/server/7.0.11/docs/README-short.txt similarity index 100% rename from 7.1.0/docs/README-short.txt rename to images/server/7.0.11/docs/README-short.txt diff --git a/7.0.11/docs/content.md b/images/server/7.0.11/docs/content.md similarity index 100% rename from 7.0.11/docs/content.md rename to images/server/7.0.11/docs/content.md diff --git a/7.0.8/docs/github-repo b/images/server/7.0.11/docs/github-repo similarity index 100% rename from 7.0.8/docs/github-repo rename to images/server/7.0.11/docs/github-repo diff --git a/7.1.0/docs/license.md b/images/server/7.0.11/docs/license.md similarity index 100% rename from 7.1.0/docs/license.md rename to images/server/7.0.11/docs/license.md diff --git a/7.0.9/docs/logo.svg b/images/server/7.0.11/docs/logo.svg similarity index 100% rename from 7.0.9/docs/logo.svg rename to images/server/7.0.11/docs/logo.svg diff --git a/7.1.0/docs/maintainer.md b/images/server/7.0.11/docs/maintainer.md similarity index 100% rename from 7.1.0/docs/maintainer.md rename to images/server/7.0.11/docs/maintainer.md diff --git a/7.0.12/Dockerfile b/images/server/7.0.12/Dockerfile similarity index 100% rename from 7.0.12/Dockerfile rename to images/server/7.0.12/Dockerfile diff --git a/7.0.17/docker-entrypoint.sh b/images/server/7.0.12/docker-entrypoint.sh similarity index 100% rename from 7.0.17/docker-entrypoint.sh rename to images/server/7.0.12/docker-entrypoint.sh diff --git a/7.0.12/dockerlibfile-fragment.txt b/images/server/7.0.12/dockerlibfile-fragment.txt similarity index 100% rename from 7.0.12/dockerlibfile-fragment.txt rename to images/server/7.0.12/dockerlibfile-fragment.txt diff --git a/7.0.9/docs/README-short.txt b/images/server/7.0.12/docs/README-short.txt similarity index 100% rename from 7.0.9/docs/README-short.txt rename to images/server/7.0.12/docs/README-short.txt diff --git a/7.0.12/docs/content.md b/images/server/7.0.12/docs/content.md similarity index 100% rename from 7.0.12/docs/content.md rename to images/server/7.0.12/docs/content.md diff --git a/7.0.17/docs/github-repo b/images/server/7.0.12/docs/github-repo similarity index 100% rename from 7.0.17/docs/github-repo rename to images/server/7.0.12/docs/github-repo diff --git a/7.0.9/docs/license.md b/images/server/7.0.12/docs/license.md similarity index 100% rename from 7.0.9/docs/license.md rename to images/server/7.0.12/docs/license.md diff --git a/7.0.8/docs/logo.svg b/images/server/7.0.12/docs/logo.svg similarity index 100% rename from 7.0.8/docs/logo.svg rename to images/server/7.0.12/docs/logo.svg diff --git a/7.0.9/docs/maintainer.md b/images/server/7.0.12/docs/maintainer.md similarity index 100% rename from 7.0.9/docs/maintainer.md rename to images/server/7.0.12/docs/maintainer.md diff --git a/7.0.13/Dockerfile b/images/server/7.0.13/Dockerfile similarity index 100% rename from 7.0.13/Dockerfile rename to images/server/7.0.13/Dockerfile diff --git a/7.0.16/docker-entrypoint.sh b/images/server/7.0.13/docker-entrypoint.sh similarity index 100% rename from 7.0.16/docker-entrypoint.sh rename to images/server/7.0.13/docker-entrypoint.sh diff --git a/7.0.13/dockerlibfile-fragment.txt b/images/server/7.0.13/dockerlibfile-fragment.txt similarity index 100% rename from 7.0.13/dockerlibfile-fragment.txt rename to images/server/7.0.13/dockerlibfile-fragment.txt diff --git a/7.0.8/docs/README-short.txt b/images/server/7.0.13/docs/README-short.txt similarity index 100% rename from 7.0.8/docs/README-short.txt rename to images/server/7.0.13/docs/README-short.txt diff --git a/7.0.13/docs/content.md b/images/server/7.0.13/docs/content.md similarity index 100% rename from 7.0.13/docs/content.md rename to images/server/7.0.13/docs/content.md diff --git a/7.0.16/docs/github-repo b/images/server/7.0.13/docs/github-repo similarity index 100% rename from 7.0.16/docs/github-repo rename to images/server/7.0.13/docs/github-repo diff --git a/7.0.8/docs/license.md b/images/server/7.0.13/docs/license.md similarity index 100% rename from 7.0.8/docs/license.md rename to images/server/7.0.13/docs/license.md diff --git a/7.0.23/docs/logo.svg b/images/server/7.0.13/docs/logo.svg similarity index 100% rename from 7.0.23/docs/logo.svg rename to images/server/7.0.13/docs/logo.svg diff --git a/7.0.8/docs/maintainer.md b/images/server/7.0.13/docs/maintainer.md similarity index 100% rename from 7.0.8/docs/maintainer.md rename to images/server/7.0.13/docs/maintainer.md diff --git a/7.0.14/Dockerfile b/images/server/7.0.14/Dockerfile similarity index 100% rename from 7.0.14/Dockerfile rename to images/server/7.0.14/Dockerfile diff --git a/7.0.15/docker-entrypoint.sh b/images/server/7.0.14/docker-entrypoint.sh similarity index 100% rename from 7.0.15/docker-entrypoint.sh rename to images/server/7.0.14/docker-entrypoint.sh diff --git a/7.0.14/dockerlibfile-fragment.txt b/images/server/7.0.14/dockerlibfile-fragment.txt similarity index 100% rename from 7.0.14/dockerlibfile-fragment.txt rename to images/server/7.0.14/dockerlibfile-fragment.txt diff --git a/7.0.25/docs/README-short.txt b/images/server/7.0.14/docs/README-short.txt similarity index 100% rename from 7.0.25/docs/README-short.txt rename to images/server/7.0.14/docs/README-short.txt diff --git a/7.0.14/docs/content.md b/images/server/7.0.14/docs/content.md similarity index 100% rename from 7.0.14/docs/content.md rename to images/server/7.0.14/docs/content.md diff --git a/7.0.15/docs/github-repo b/images/server/7.0.14/docs/github-repo similarity index 100% rename from 7.0.15/docs/github-repo rename to images/server/7.0.14/docs/github-repo diff --git a/7.0.25/docs/license.md b/images/server/7.0.14/docs/license.md similarity index 100% rename from 7.0.25/docs/license.md rename to images/server/7.0.14/docs/license.md diff --git a/7.0.22/docs/logo.svg b/images/server/7.0.14/docs/logo.svg similarity index 100% rename from 7.0.22/docs/logo.svg rename to images/server/7.0.14/docs/logo.svg diff --git a/7.0.25/docs/maintainer.md b/images/server/7.0.14/docs/maintainer.md similarity index 100% rename from 7.0.25/docs/maintainer.md rename to images/server/7.0.14/docs/maintainer.md diff --git a/7.0.15/Dockerfile b/images/server/7.0.15/Dockerfile similarity index 100% rename from 7.0.15/Dockerfile rename to images/server/7.0.15/Dockerfile diff --git a/7.0.14/docker-entrypoint.sh b/images/server/7.0.15/docker-entrypoint.sh similarity index 100% rename from 7.0.14/docker-entrypoint.sh rename to images/server/7.0.15/docker-entrypoint.sh diff --git a/7.0.15/dockerlibfile-fragment.txt b/images/server/7.0.15/dockerlibfile-fragment.txt similarity index 100% rename from 7.0.15/dockerlibfile-fragment.txt rename to images/server/7.0.15/dockerlibfile-fragment.txt diff --git a/7.0.24/docs/README-short.txt b/images/server/7.0.15/docs/README-short.txt similarity index 100% rename from 7.0.24/docs/README-short.txt rename to images/server/7.0.15/docs/README-short.txt diff --git a/7.0.15/docs/content.md b/images/server/7.0.15/docs/content.md similarity index 100% rename from 7.0.15/docs/content.md rename to images/server/7.0.15/docs/content.md diff --git a/7.0.14/docs/github-repo b/images/server/7.0.15/docs/github-repo similarity index 100% rename from 7.0.14/docs/github-repo rename to images/server/7.0.15/docs/github-repo diff --git a/7.0.24/docs/license.md b/images/server/7.0.15/docs/license.md similarity index 100% rename from 7.0.24/docs/license.md rename to images/server/7.0.15/docs/license.md diff --git a/7.0.21/docs/logo.svg b/images/server/7.0.15/docs/logo.svg similarity index 100% rename from 7.0.21/docs/logo.svg rename to images/server/7.0.15/docs/logo.svg diff --git a/7.0.24/docs/maintainer.md b/images/server/7.0.15/docs/maintainer.md similarity index 100% rename from 7.0.24/docs/maintainer.md rename to images/server/7.0.15/docs/maintainer.md diff --git a/7.0.16/Dockerfile b/images/server/7.0.16/Dockerfile similarity index 100% rename from 7.0.16/Dockerfile rename to images/server/7.0.16/Dockerfile diff --git a/7.0.13/docker-entrypoint.sh b/images/server/7.0.16/docker-entrypoint.sh similarity index 100% rename from 7.0.13/docker-entrypoint.sh rename to images/server/7.0.16/docker-entrypoint.sh diff --git a/7.0.16/dockerlibfile-fragment.txt b/images/server/7.0.16/dockerlibfile-fragment.txt similarity index 100% rename from 7.0.16/dockerlibfile-fragment.txt rename to images/server/7.0.16/dockerlibfile-fragment.txt diff --git a/7.0.23/docs/README-short.txt b/images/server/7.0.16/docs/README-short.txt similarity index 100% rename from 7.0.23/docs/README-short.txt rename to images/server/7.0.16/docs/README-short.txt diff --git a/7.0.16/docs/content.md b/images/server/7.0.16/docs/content.md similarity index 100% rename from 7.0.16/docs/content.md rename to images/server/7.0.16/docs/content.md diff --git a/7.0.13/docs/github-repo b/images/server/7.0.16/docs/github-repo similarity index 100% rename from 7.0.13/docs/github-repo rename to images/server/7.0.16/docs/github-repo diff --git a/7.0.23/docs/license.md b/images/server/7.0.16/docs/license.md similarity index 100% rename from 7.0.23/docs/license.md rename to images/server/7.0.16/docs/license.md diff --git a/7.0.20/docs/logo.svg b/images/server/7.0.16/docs/logo.svg similarity index 100% rename from 7.0.20/docs/logo.svg rename to images/server/7.0.16/docs/logo.svg diff --git a/7.0.23/docs/maintainer.md b/images/server/7.0.16/docs/maintainer.md similarity index 100% rename from 7.0.23/docs/maintainer.md rename to images/server/7.0.16/docs/maintainer.md diff --git a/7.0.17/Dockerfile b/images/server/7.0.17/Dockerfile similarity index 100% rename from 7.0.17/Dockerfile rename to images/server/7.0.17/Dockerfile diff --git a/7.0.12/docker-entrypoint.sh b/images/server/7.0.17/docker-entrypoint.sh similarity index 100% rename from 7.0.12/docker-entrypoint.sh rename to images/server/7.0.17/docker-entrypoint.sh diff --git a/7.0.17/dockerlibfile-fragment.txt b/images/server/7.0.17/dockerlibfile-fragment.txt similarity index 100% rename from 7.0.17/dockerlibfile-fragment.txt rename to images/server/7.0.17/dockerlibfile-fragment.txt diff --git a/7.0.22/docs/README-short.txt b/images/server/7.0.17/docs/README-short.txt similarity index 100% rename from 7.0.22/docs/README-short.txt rename to images/server/7.0.17/docs/README-short.txt diff --git a/7.0.17/docs/content.md b/images/server/7.0.17/docs/content.md similarity index 100% rename from 7.0.17/docs/content.md rename to images/server/7.0.17/docs/content.md diff --git a/7.0.12/docs/github-repo b/images/server/7.0.17/docs/github-repo similarity index 100% rename from 7.0.12/docs/github-repo rename to images/server/7.0.17/docs/github-repo diff --git a/7.0.22/docs/license.md b/images/server/7.0.17/docs/license.md similarity index 100% rename from 7.0.22/docs/license.md rename to images/server/7.0.17/docs/license.md diff --git a/7.0.19/docs/logo.svg b/images/server/7.0.17/docs/logo.svg similarity index 100% rename from 7.0.19/docs/logo.svg rename to images/server/7.0.17/docs/logo.svg diff --git a/7.0.22/docs/maintainer.md b/images/server/7.0.17/docs/maintainer.md similarity index 100% rename from 7.0.22/docs/maintainer.md rename to images/server/7.0.17/docs/maintainer.md diff --git a/7.0.18/Dockerfile b/images/server/7.0.18/Dockerfile similarity index 100% rename from 7.0.18/Dockerfile rename to images/server/7.0.18/Dockerfile diff --git a/7.0.20/docker-entrypoint.sh b/images/server/7.0.18/docker-entrypoint.sh similarity index 100% rename from 7.0.20/docker-entrypoint.sh rename to images/server/7.0.18/docker-entrypoint.sh diff --git a/7.0.18/dockerlibfile-fragment.txt b/images/server/7.0.18/dockerlibfile-fragment.txt similarity index 100% rename from 7.0.18/dockerlibfile-fragment.txt rename to images/server/7.0.18/dockerlibfile-fragment.txt diff --git a/7.0.21/docs/README-short.txt b/images/server/7.0.18/docs/README-short.txt similarity index 100% rename from 7.0.21/docs/README-short.txt rename to images/server/7.0.18/docs/README-short.txt diff --git a/7.0.18/docs/content.md b/images/server/7.0.18/docs/content.md similarity index 100% rename from 7.0.18/docs/content.md rename to images/server/7.0.18/docs/content.md diff --git a/src/main/resources/docs/github-repo b/images/server/7.0.18/docs/github-repo similarity index 100% rename from src/main/resources/docs/github-repo rename to images/server/7.0.18/docs/github-repo diff --git a/7.0.21/docs/license.md b/images/server/7.0.18/docs/license.md similarity index 100% rename from 7.0.21/docs/license.md rename to images/server/7.0.18/docs/license.md diff --git a/7.0.18/docs/logo.svg b/images/server/7.0.18/docs/logo.svg similarity index 100% rename from 7.0.18/docs/logo.svg rename to images/server/7.0.18/docs/logo.svg diff --git a/7.0.21/docs/maintainer.md b/images/server/7.0.18/docs/maintainer.md similarity index 100% rename from 7.0.21/docs/maintainer.md rename to images/server/7.0.18/docs/maintainer.md diff --git a/7.0.19/Dockerfile b/images/server/7.0.19/Dockerfile similarity index 100% rename from 7.0.19/Dockerfile rename to images/server/7.0.19/Dockerfile diff --git a/7.0.19/docker-entrypoint.sh b/images/server/7.0.19/docker-entrypoint.sh similarity index 100% rename from 7.0.19/docker-entrypoint.sh rename to images/server/7.0.19/docker-entrypoint.sh diff --git a/7.0.19/dockerlibfile-fragment.txt b/images/server/7.0.19/dockerlibfile-fragment.txt similarity index 100% rename from 7.0.19/dockerlibfile-fragment.txt rename to images/server/7.0.19/dockerlibfile-fragment.txt diff --git a/7.0.20/docs/README-short.txt b/images/server/7.0.19/docs/README-short.txt similarity index 100% rename from 7.0.20/docs/README-short.txt rename to images/server/7.0.19/docs/README-short.txt diff --git a/7.0.19/docs/content.md b/images/server/7.0.19/docs/content.md similarity index 100% rename from 7.0.19/docs/content.md rename to images/server/7.0.19/docs/content.md diff --git a/7.1.0/docs/github-repo b/images/server/7.0.19/docs/github-repo similarity index 100% rename from 7.1.0/docs/github-repo rename to images/server/7.0.19/docs/github-repo diff --git a/7.0.20/docs/license.md b/images/server/7.0.19/docs/license.md similarity index 100% rename from 7.0.20/docs/license.md rename to images/server/7.0.19/docs/license.md diff --git a/7.0.17/docs/logo.svg b/images/server/7.0.19/docs/logo.svg similarity index 100% rename from 7.0.17/docs/logo.svg rename to images/server/7.0.19/docs/logo.svg diff --git a/7.0.20/docs/maintainer.md b/images/server/7.0.19/docs/maintainer.md similarity index 100% rename from 7.0.20/docs/maintainer.md rename to images/server/7.0.19/docs/maintainer.md diff --git a/7.0.2/Dockerfile b/images/server/7.0.2/Dockerfile similarity index 100% rename from 7.0.2/Dockerfile rename to images/server/7.0.2/Dockerfile diff --git a/7.0.5/docker-entrypoint.sh b/images/server/7.0.2/docker-entrypoint.sh similarity index 100% rename from 7.0.5/docker-entrypoint.sh rename to images/server/7.0.2/docker-entrypoint.sh diff --git a/7.0.2/dockerlibfile-fragment.txt b/images/server/7.0.2/dockerlibfile-fragment.txt similarity index 100% rename from 7.0.2/dockerlibfile-fragment.txt rename to images/server/7.0.2/dockerlibfile-fragment.txt diff --git a/7.0.20/Dockerfile b/images/server/7.0.20/Dockerfile similarity index 100% rename from 7.0.20/Dockerfile rename to images/server/7.0.20/Dockerfile diff --git a/7.0.18/docker-entrypoint.sh b/images/server/7.0.20/docker-entrypoint.sh similarity index 100% rename from 7.0.18/docker-entrypoint.sh rename to images/server/7.0.20/docker-entrypoint.sh diff --git a/7.0.20/dockerlibfile-fragment.txt b/images/server/7.0.20/dockerlibfile-fragment.txt similarity index 100% rename from 7.0.20/dockerlibfile-fragment.txt rename to images/server/7.0.20/dockerlibfile-fragment.txt diff --git a/7.0.19/docs/README-short.txt b/images/server/7.0.20/docs/README-short.txt similarity index 100% rename from 7.0.19/docs/README-short.txt rename to images/server/7.0.20/docs/README-short.txt diff --git a/7.0.20/docs/content.md b/images/server/7.0.20/docs/content.md similarity index 100% rename from 7.0.20/docs/content.md rename to images/server/7.0.20/docs/content.md diff --git a/7.0.25/docs/github-repo b/images/server/7.0.20/docs/github-repo similarity index 100% rename from 7.0.25/docs/github-repo rename to images/server/7.0.20/docs/github-repo diff --git a/7.0.19/docs/license.md b/images/server/7.0.20/docs/license.md similarity index 100% rename from 7.0.19/docs/license.md rename to images/server/7.0.20/docs/license.md diff --git a/7.0.16/docs/logo.svg b/images/server/7.0.20/docs/logo.svg similarity index 100% rename from 7.0.16/docs/logo.svg rename to images/server/7.0.20/docs/logo.svg diff --git a/7.0.19/docs/maintainer.md b/images/server/7.0.20/docs/maintainer.md similarity index 100% rename from 7.0.19/docs/maintainer.md rename to images/server/7.0.20/docs/maintainer.md diff --git a/7.0.21/Dockerfile b/images/server/7.0.21/Dockerfile similarity index 100% rename from 7.0.21/Dockerfile rename to images/server/7.0.21/Dockerfile diff --git a/7.0.25/docker-entrypoint.sh b/images/server/7.0.21/docker-entrypoint.sh similarity index 100% rename from 7.0.25/docker-entrypoint.sh rename to images/server/7.0.21/docker-entrypoint.sh diff --git a/7.0.21/dockerlibfile-fragment.txt b/images/server/7.0.21/dockerlibfile-fragment.txt similarity index 100% rename from 7.0.21/dockerlibfile-fragment.txt rename to images/server/7.0.21/dockerlibfile-fragment.txt diff --git a/7.0.18/docs/README-short.txt b/images/server/7.0.21/docs/README-short.txt similarity index 100% rename from 7.0.18/docs/README-short.txt rename to images/server/7.0.21/docs/README-short.txt diff --git a/7.0.21/docs/content.md b/images/server/7.0.21/docs/content.md similarity index 100% rename from 7.0.21/docs/content.md rename to images/server/7.0.21/docs/content.md diff --git a/7.0.24/docs/github-repo b/images/server/7.0.21/docs/github-repo similarity index 100% rename from 7.0.24/docs/github-repo rename to images/server/7.0.21/docs/github-repo diff --git a/7.0.18/docs/license.md b/images/server/7.0.21/docs/license.md similarity index 100% rename from 7.0.18/docs/license.md rename to images/server/7.0.21/docs/license.md diff --git a/7.0.15/docs/logo.svg b/images/server/7.0.21/docs/logo.svg similarity index 100% rename from 7.0.15/docs/logo.svg rename to images/server/7.0.21/docs/logo.svg diff --git a/7.0.18/docs/maintainer.md b/images/server/7.0.21/docs/maintainer.md similarity index 100% rename from 7.0.18/docs/maintainer.md rename to images/server/7.0.21/docs/maintainer.md diff --git a/7.0.22/Dockerfile b/images/server/7.0.22/Dockerfile similarity index 100% rename from 7.0.22/Dockerfile rename to images/server/7.0.22/Dockerfile diff --git a/7.0.24/docker-entrypoint.sh b/images/server/7.0.22/docker-entrypoint.sh similarity index 100% rename from 7.0.24/docker-entrypoint.sh rename to images/server/7.0.22/docker-entrypoint.sh diff --git a/7.0.22/dockerlibfile-fragment.txt b/images/server/7.0.22/dockerlibfile-fragment.txt similarity index 100% rename from 7.0.22/dockerlibfile-fragment.txt rename to images/server/7.0.22/dockerlibfile-fragment.txt diff --git a/7.0.17/docs/README-short.txt b/images/server/7.0.22/docs/README-short.txt similarity index 100% rename from 7.0.17/docs/README-short.txt rename to images/server/7.0.22/docs/README-short.txt diff --git a/7.0.22/docs/content.md b/images/server/7.0.22/docs/content.md similarity index 100% rename from 7.0.22/docs/content.md rename to images/server/7.0.22/docs/content.md diff --git a/7.0.23/docs/github-repo b/images/server/7.0.22/docs/github-repo similarity index 100% rename from 7.0.23/docs/github-repo rename to images/server/7.0.22/docs/github-repo diff --git a/7.0.17/docs/license.md b/images/server/7.0.22/docs/license.md similarity index 100% rename from 7.0.17/docs/license.md rename to images/server/7.0.22/docs/license.md diff --git a/7.0.14/docs/logo.svg b/images/server/7.0.22/docs/logo.svg similarity index 100% rename from 7.0.14/docs/logo.svg rename to images/server/7.0.22/docs/logo.svg diff --git a/7.0.17/docs/maintainer.md b/images/server/7.0.22/docs/maintainer.md similarity index 100% rename from 7.0.17/docs/maintainer.md rename to images/server/7.0.22/docs/maintainer.md diff --git a/7.0.23/Dockerfile b/images/server/7.0.23/Dockerfile similarity index 100% rename from 7.0.23/Dockerfile rename to images/server/7.0.23/Dockerfile diff --git a/7.0.23/docker-entrypoint.sh b/images/server/7.0.23/docker-entrypoint.sh similarity index 100% rename from 7.0.23/docker-entrypoint.sh rename to images/server/7.0.23/docker-entrypoint.sh diff --git a/7.0.23/dockerlibfile-fragment.txt b/images/server/7.0.23/dockerlibfile-fragment.txt similarity index 100% rename from 7.0.23/dockerlibfile-fragment.txt rename to images/server/7.0.23/dockerlibfile-fragment.txt diff --git a/7.0.16/docs/README-short.txt b/images/server/7.0.23/docs/README-short.txt similarity index 100% rename from 7.0.16/docs/README-short.txt rename to images/server/7.0.23/docs/README-short.txt diff --git a/7.0.23/docs/content.md b/images/server/7.0.23/docs/content.md similarity index 100% rename from 7.0.23/docs/content.md rename to images/server/7.0.23/docs/content.md diff --git a/7.0.22/docs/github-repo b/images/server/7.0.23/docs/github-repo similarity index 100% rename from 7.0.22/docs/github-repo rename to images/server/7.0.23/docs/github-repo diff --git a/7.0.16/docs/license.md b/images/server/7.0.23/docs/license.md similarity index 100% rename from 7.0.16/docs/license.md rename to images/server/7.0.23/docs/license.md diff --git a/7.0.13/docs/logo.svg b/images/server/7.0.23/docs/logo.svg similarity index 100% rename from 7.0.13/docs/logo.svg rename to images/server/7.0.23/docs/logo.svg diff --git a/7.0.16/docs/maintainer.md b/images/server/7.0.23/docs/maintainer.md similarity index 100% rename from 7.0.16/docs/maintainer.md rename to images/server/7.0.23/docs/maintainer.md diff --git a/7.0.24/Dockerfile b/images/server/7.0.24/Dockerfile similarity index 100% rename from 7.0.24/Dockerfile rename to images/server/7.0.24/Dockerfile diff --git a/7.0.22/docker-entrypoint.sh b/images/server/7.0.24/docker-entrypoint.sh similarity index 100% rename from 7.0.22/docker-entrypoint.sh rename to images/server/7.0.24/docker-entrypoint.sh diff --git a/7.0.24/dockerlibfile-fragment.txt b/images/server/7.0.24/dockerlibfile-fragment.txt similarity index 100% rename from 7.0.24/dockerlibfile-fragment.txt rename to images/server/7.0.24/dockerlibfile-fragment.txt diff --git a/7.0.15/docs/README-short.txt b/images/server/7.0.24/docs/README-short.txt similarity index 100% rename from 7.0.15/docs/README-short.txt rename to images/server/7.0.24/docs/README-short.txt diff --git a/7.0.24/docs/content.md b/images/server/7.0.24/docs/content.md similarity index 100% rename from 7.0.24/docs/content.md rename to images/server/7.0.24/docs/content.md diff --git a/7.0.21/docs/github-repo b/images/server/7.0.24/docs/github-repo similarity index 100% rename from 7.0.21/docs/github-repo rename to images/server/7.0.24/docs/github-repo diff --git a/7.0.15/docs/license.md b/images/server/7.0.24/docs/license.md similarity index 100% rename from 7.0.15/docs/license.md rename to images/server/7.0.24/docs/license.md diff --git a/7.1.0/docs/logo.svg b/images/server/7.0.24/docs/logo.svg similarity index 100% rename from 7.1.0/docs/logo.svg rename to images/server/7.0.24/docs/logo.svg diff --git a/7.0.15/docs/maintainer.md b/images/server/7.0.24/docs/maintainer.md similarity index 100% rename from 7.0.15/docs/maintainer.md rename to images/server/7.0.24/docs/maintainer.md diff --git a/7.0.25/Dockerfile b/images/server/7.0.25/Dockerfile similarity index 100% rename from 7.0.25/Dockerfile rename to images/server/7.0.25/Dockerfile diff --git a/7.0.21/docker-entrypoint.sh b/images/server/7.0.25/docker-entrypoint.sh similarity index 100% rename from 7.0.21/docker-entrypoint.sh rename to images/server/7.0.25/docker-entrypoint.sh diff --git a/7.0.25/dockerlibfile-fragment.txt b/images/server/7.0.25/dockerlibfile-fragment.txt similarity index 100% rename from 7.0.25/dockerlibfile-fragment.txt rename to images/server/7.0.25/dockerlibfile-fragment.txt diff --git a/7.0.14/docs/README-short.txt b/images/server/7.0.25/docs/README-short.txt similarity index 100% rename from 7.0.14/docs/README-short.txt rename to images/server/7.0.25/docs/README-short.txt diff --git a/7.0.25/docs/content.md b/images/server/7.0.25/docs/content.md similarity index 100% rename from 7.0.25/docs/content.md rename to images/server/7.0.25/docs/content.md diff --git a/7.0.20/docs/github-repo b/images/server/7.0.25/docs/github-repo similarity index 100% rename from 7.0.20/docs/github-repo rename to images/server/7.0.25/docs/github-repo diff --git a/7.0.14/docs/license.md b/images/server/7.0.25/docs/license.md similarity index 100% rename from 7.0.14/docs/license.md rename to images/server/7.0.25/docs/license.md diff --git a/7.0.25/docs/logo.svg b/images/server/7.0.25/docs/logo.svg similarity index 100% rename from 7.0.25/docs/logo.svg rename to images/server/7.0.25/docs/logo.svg diff --git a/7.0.14/docs/maintainer.md b/images/server/7.0.25/docs/maintainer.md similarity index 100% rename from 7.0.14/docs/maintainer.md rename to images/server/7.0.25/docs/maintainer.md diff --git a/7.0.3/Dockerfile b/images/server/7.0.3/Dockerfile similarity index 100% rename from 7.0.3/Dockerfile rename to images/server/7.0.3/Dockerfile diff --git a/7.0.4/docker-entrypoint.sh b/images/server/7.0.3/docker-entrypoint.sh similarity index 100% rename from 7.0.4/docker-entrypoint.sh rename to images/server/7.0.3/docker-entrypoint.sh diff --git a/7.0.3/dockerlibfile-fragment.txt b/images/server/7.0.3/dockerlibfile-fragment.txt similarity index 100% rename from 7.0.3/dockerlibfile-fragment.txt rename to images/server/7.0.3/dockerlibfile-fragment.txt diff --git a/7.0.4/Dockerfile b/images/server/7.0.4/Dockerfile similarity index 100% rename from 7.0.4/Dockerfile rename to images/server/7.0.4/Dockerfile diff --git a/7.0.3/docker-entrypoint.sh b/images/server/7.0.4/docker-entrypoint.sh similarity index 100% rename from 7.0.3/docker-entrypoint.sh rename to images/server/7.0.4/docker-entrypoint.sh diff --git a/7.0.4/dockerlibfile-fragment.txt b/images/server/7.0.4/dockerlibfile-fragment.txt similarity index 100% rename from 7.0.4/dockerlibfile-fragment.txt rename to images/server/7.0.4/dockerlibfile-fragment.txt diff --git a/7.0.5/Dockerfile b/images/server/7.0.5/Dockerfile similarity index 100% rename from 7.0.5/Dockerfile rename to images/server/7.0.5/Dockerfile diff --git a/7.0.2/docker-entrypoint.sh b/images/server/7.0.5/docker-entrypoint.sh similarity index 100% rename from 7.0.2/docker-entrypoint.sh rename to images/server/7.0.5/docker-entrypoint.sh diff --git a/7.0.5/dockerlibfile-fragment.txt b/images/server/7.0.5/dockerlibfile-fragment.txt similarity index 100% rename from 7.0.5/dockerlibfile-fragment.txt rename to images/server/7.0.5/dockerlibfile-fragment.txt diff --git a/7.0.6/Dockerfile b/images/server/7.0.6/Dockerfile similarity index 100% rename from 7.0.6/Dockerfile rename to images/server/7.0.6/Dockerfile diff --git a/7.0.1/docker-entrypoint.sh b/images/server/7.0.6/docker-entrypoint.sh similarity index 100% rename from 7.0.1/docker-entrypoint.sh rename to images/server/7.0.6/docker-entrypoint.sh diff --git a/7.0.6/dockerlibfile-fragment.txt b/images/server/7.0.6/dockerlibfile-fragment.txt similarity index 100% rename from 7.0.6/dockerlibfile-fragment.txt rename to images/server/7.0.6/dockerlibfile-fragment.txt diff --git a/7.0.7/Dockerfile b/images/server/7.0.7/Dockerfile similarity index 100% rename from 7.0.7/Dockerfile rename to images/server/7.0.7/Dockerfile diff --git a/7.0.0/docker-entrypoint.sh b/images/server/7.0.7/docker-entrypoint.sh similarity index 100% rename from 7.0.0/docker-entrypoint.sh rename to images/server/7.0.7/docker-entrypoint.sh diff --git a/7.0.7/dockerlibfile-fragment.txt b/images/server/7.0.7/dockerlibfile-fragment.txt similarity index 100% rename from 7.0.7/dockerlibfile-fragment.txt rename to images/server/7.0.7/dockerlibfile-fragment.txt diff --git a/7.0.8/Dockerfile b/images/server/7.0.8/Dockerfile similarity index 100% rename from 7.0.8/Dockerfile rename to images/server/7.0.8/Dockerfile diff --git a/7.0.11/docker-entrypoint.sh b/images/server/7.0.8/docker-entrypoint.sh similarity index 100% rename from 7.0.11/docker-entrypoint.sh rename to images/server/7.0.8/docker-entrypoint.sh diff --git a/7.0.8/dockerlibfile-fragment.txt b/images/server/7.0.8/dockerlibfile-fragment.txt similarity index 100% rename from 7.0.8/dockerlibfile-fragment.txt rename to images/server/7.0.8/dockerlibfile-fragment.txt diff --git a/7.0.13/docs/README-short.txt b/images/server/7.0.8/docs/README-short.txt similarity index 100% rename from 7.0.13/docs/README-short.txt rename to images/server/7.0.8/docs/README-short.txt diff --git a/7.0.8/docs/content.md b/images/server/7.0.8/docs/content.md similarity index 100% rename from 7.0.8/docs/content.md rename to images/server/7.0.8/docs/content.md diff --git a/7.0.11/docs/github-repo b/images/server/7.0.8/docs/github-repo similarity index 100% rename from 7.0.11/docs/github-repo rename to images/server/7.0.8/docs/github-repo diff --git a/7.0.13/docs/license.md b/images/server/7.0.8/docs/license.md similarity index 100% rename from 7.0.13/docs/license.md rename to images/server/7.0.8/docs/license.md diff --git a/7.0.12/docs/logo.svg b/images/server/7.0.8/docs/logo.svg similarity index 100% rename from 7.0.12/docs/logo.svg rename to images/server/7.0.8/docs/logo.svg diff --git a/7.0.13/docs/maintainer.md b/images/server/7.0.8/docs/maintainer.md similarity index 100% rename from 7.0.13/docs/maintainer.md rename to images/server/7.0.8/docs/maintainer.md diff --git a/7.0.9/Dockerfile b/images/server/7.0.9/Dockerfile similarity index 100% rename from 7.0.9/Dockerfile rename to images/server/7.0.9/Dockerfile diff --git a/7.0.10/docker-entrypoint.sh b/images/server/7.0.9/docker-entrypoint.sh similarity index 100% rename from 7.0.10/docker-entrypoint.sh rename to images/server/7.0.9/docker-entrypoint.sh diff --git a/7.0.9/dockerlibfile-fragment.txt b/images/server/7.0.9/dockerlibfile-fragment.txt similarity index 100% rename from 7.0.9/dockerlibfile-fragment.txt rename to images/server/7.0.9/dockerlibfile-fragment.txt diff --git a/7.0.12/docs/README-short.txt b/images/server/7.0.9/docs/README-short.txt similarity index 100% rename from 7.0.12/docs/README-short.txt rename to images/server/7.0.9/docs/README-short.txt diff --git a/7.0.9/docs/content.md b/images/server/7.0.9/docs/content.md similarity index 100% rename from 7.0.9/docs/content.md rename to images/server/7.0.9/docs/content.md diff --git a/7.0.10/docs/github-repo b/images/server/7.0.9/docs/github-repo similarity index 100% rename from 7.0.10/docs/github-repo rename to images/server/7.0.9/docs/github-repo diff --git a/7.0.12/docs/license.md b/images/server/7.0.9/docs/license.md similarity index 100% rename from 7.0.12/docs/license.md rename to images/server/7.0.9/docs/license.md diff --git a/7.0.11/docs/logo.svg b/images/server/7.0.9/docs/logo.svg similarity index 100% rename from 7.0.11/docs/logo.svg rename to images/server/7.0.9/docs/logo.svg diff --git a/7.0.12/docs/maintainer.md b/images/server/7.0.9/docs/maintainer.md similarity index 100% rename from 7.0.12/docs/maintainer.md rename to images/server/7.0.9/docs/maintainer.md diff --git a/7.1.0/Dockerfile b/images/server/7.1.0/Dockerfile old mode 100644 new mode 100755 similarity index 91% rename from 7.1.0/Dockerfile rename to images/server/7.1.0/Dockerfile index 7fc38d8..daa4e32 --- a/7.1.0/Dockerfile +++ b/images/server/7.1.0/Dockerfile @@ -1,6 +1,6 @@ -FROM eclipse-temurin:21.0.9_10-jdk +FROM eclipse-temurin:21-jdk -LABEL org.opencontainers.image.base.name="eclipse-temurin:21.0.9_10-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" @@ -12,7 +12,7 @@ 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 7676 8686 3700 3820 3920 6666 +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 \ @@ -34,13 +34,11 @@ ENV AS_USER=${AS_ADMIN_USER} \ PATH_GF_SERVER_LOG="${PATH_GF_HOME}/glassfish/domains/domain1/logs/server.log" ENV PATH="${PATH_GF_BIN}:${PATH}" -COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh - RUN true \ && set -x \ - && apt update \ - && apt upgrade -y \ - && apt install -y gpg unzip \ + && 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)" \ @@ -76,10 +74,11 @@ RUN true \ && asadmin stop-domain --kill \ && rm -f ${PATH_GF_SERVER_LOG} ${PATH_GF_PASSWORD_FILE_FOR_CHANGE} \ && chown -R glassfish:glassfish "${PATH_GF_HOME}" \ - && chmod +x /usr/local/bin/docker-entrypoint.sh \ && mkdir ${PATH_GF_HOME}/autodeploy \ && 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"] diff --git a/src/main/resources/docker-entrypoint.sh b/images/server/7.1.0/docker-entrypoint.sh similarity index 100% rename from src/main/resources/docker-entrypoint.sh rename to images/server/7.1.0/docker-entrypoint.sh diff --git a/7.1.0/dockerlibfile-fragment.txt b/images/server/7.1.0/dockerlibfile-fragment.txt similarity index 100% rename from 7.1.0/dockerlibfile-fragment.txt rename to images/server/7.1.0/dockerlibfile-fragment.txt diff --git a/7.0.11/docs/README-short.txt b/images/server/7.1.0/docs/README-short.txt similarity index 100% rename from 7.0.11/docs/README-short.txt rename to images/server/7.1.0/docs/README-short.txt diff --git a/src/main/resources/docs/content.md b/images/server/7.1.0/docs/content.md similarity index 100% rename from src/main/resources/docs/content.md rename to images/server/7.1.0/docs/content.md diff --git a/7.0.19/docs/github-repo b/images/server/7.1.0/docs/github-repo similarity index 100% rename from 7.0.19/docs/github-repo rename to images/server/7.1.0/docs/github-repo diff --git a/7.0.11/docs/license.md b/images/server/7.1.0/docs/license.md similarity index 100% rename from 7.0.11/docs/license.md rename to images/server/7.1.0/docs/license.md diff --git a/7.0.24/docs/logo.svg b/images/server/7.1.0/docs/logo.svg similarity index 100% rename from 7.0.24/docs/logo.svg rename to images/server/7.1.0/docs/logo.svg diff --git a/7.0.11/docs/maintainer.md b/images/server/7.1.0/docs/maintainer.md similarity index 100% rename from 7.0.11/docs/maintainer.md rename to images/server/7.1.0/docs/maintainer.md diff --git a/pom.xml b/pom.xml index 14db05b..1cc2150 100644 --- a/pom.xml +++ b/pom.xml @@ -11,13 +11,16 @@ Eclipse Glassfish Docker Image Distribution - eclipse-temurin:21-jdk 7.1.0 - glassfish - ${glassfish.version} - ${docker.glassfish.repository}:${docker.glassfish.tag} - linux/amd64,linux/arm64 UTF-8 + linux/amd64,linux/arm64 + ${glassfish.version} + eclipse-temurin:21-jdk + glassfish + ${server.docker.glassfish.repository}:${docker.glassfish.tag} + images/server + ${basedir}/${server.relative.dir} + src/main/resources/${server.relative.dir} @@ -54,24 +57,6 @@ - - - src/main/resources - - Dockerfile - dockerlibfile-fragment.txt - docs/** - - true - - - src/main/resources - - docker-entrypoint.sh - - false - - maven-enforcer-plugin @@ -177,11 +162,29 @@ filter-dockerfile - resources + copy-resources prepare-package - ${basedir}/${docker.glassfish.tag} + ${server.images.dir}/${docker.glassfish.tag} + + + ${server.resources.dir} + + Dockerfile + dockerlibfile-fragment.txt + docs/** + + true + + + ${server.resources.dir} + + docker-entrypoint.sh + + false + + @@ -203,7 +206,7 @@ true - ${docker.glassfish.repository} + ${server.docker.glassfish.repository} @@ -215,7 +218,7 @@ none false - ${basedir}/${docker.glassfish.tag}/Dockerfile + ${server.images.dir}/${docker.glassfish.tag}/Dockerfile @ @@ -267,7 +270,7 @@ 3.5.1 - ${docker.glassfish.image} + ${server.docker.glassfish.image} **/*IT.java diff --git a/src/main/resources/Dockerfile b/src/main/resources/images/server/Dockerfile similarity index 97% rename from src/main/resources/Dockerfile rename to src/main/resources/images/server/Dockerfile index d77c6cf..10ddba4 100755 --- a/src/main/resources/Dockerfile +++ b/src/main/resources/images/server/Dockerfile @@ -1,6 +1,6 @@ -FROM @docker.baseImage@ +FROM @server.docker.baseImage@ -LABEL org.opencontainers.image.base.name="@docker.baseImage@" +LABEL org.opencontainers.image.base.name="@server.docker.baseImage@" 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" diff --git a/7.1.0/docker-entrypoint.sh b/src/main/resources/images/server/docker-entrypoint.sh similarity index 100% rename from 7.1.0/docker-entrypoint.sh rename to src/main/resources/images/server/docker-entrypoint.sh diff --git a/src/main/resources/dockerlibfile-fragment.txt b/src/main/resources/images/server/dockerlibfile-fragment.txt similarity index 100% rename from src/main/resources/dockerlibfile-fragment.txt rename to src/main/resources/images/server/dockerlibfile-fragment.txt diff --git a/7.0.10/docs/README-short.txt b/src/main/resources/images/server/docs/README-short.txt similarity index 100% rename from 7.0.10/docs/README-short.txt rename to src/main/resources/images/server/docs/README-short.txt diff --git a/7.1.0/docs/content.md b/src/main/resources/images/server/docs/content.md similarity index 91% rename from 7.1.0/docs/content.md rename to src/main/resources/images/server/docs/content.md index c67fcb1..fdc6a05 100644 --- a/7.1.0/docs/content.md +++ b/src/main/resources/images/server/docs/content.md @@ -13,13 +13,13 @@ Run GlassFish with the following command: ``` -docker run -p 8080:8080 -p 4848:4848 glassfish +docker run -p 8080:8080 -p 4848:4848 @docker.glassfish.repository@ ``` Or with a command for a specific tag (GlassFish version): ``` -docker run -p 8080:8080 -p 4848:4848 glassfish:7.1.0 +docker run -p 8080:8080 -p 4848:4848 @docker.glassfish.image@ ``` Open the following URLs in the browser: @@ -52,7 +52,7 @@ Follow these steps: 3. Run the following command to start GlassFish in Docker with your application, where `/deployments` is path to the directory created in step 1: ``` -docker run -p 8080:8080 -p 4848:4848 -v /deployments:/opt/glassfish7/glassfish/domains/domain1/autodeploy glassfish +docker run -p 8080:8080 -p 4848:4848 -v /deployments:/opt/glassfish7/glassfish/domains/domain1/autodeploy @docker.glassfish.repository@ ``` Then you can open the application in the browser with: @@ -66,7 +66,7 @@ The context root (`application`) is derived from the name of the application fil You can modify the start command of the Docker container to `startserv --debug` to enable debug mode. You should also map the debug port 9009. ``` -docker run -p 9009:9009 -p 8080:8080 -p 4848:4848 glassfish startserv --debug +docker run -p 9009:9009 -p 8080:8080 -p 4848:4848 @docker.glassfish.repository@ startserv --debug ``` Then connect your debugger to the port 9009 on `localhost`. @@ -74,7 +74,7 @@ Then connect your debugger to the port 9009 on `localhost`. If you need suspend GlassFish startup until you connect the debugger, use the `--suspend` argument instead: ``` -docker run -p 9009:9009 -p 8080:8080 -p 4848:4848 glassfish startserv --suspend +docker run -p 9009:9009 -p 8080:8080 -p 4848:4848 @docker.glassfish.repository@ startserv --suspend ``` ## Environment variables @@ -122,7 +122,7 @@ stop-domain You can provide the file by mounting its directory to the `/opt/glassfish7/custom` directory in the container when running the container: ``` -docker run -v ./custom:/opt/glassfish7/custom -p 8080:8080 -ti glassfish +docker run -v ./custom:/opt/glassfish7/custom -p 8080:8080 -ti @docker.glassfish.repository@ ``` ### Execute a `bash` script before server startup @@ -148,7 +148,7 @@ stop-domain" | asadmin --interactive=false You can provide the script by mounting its directory to the `/opt/glassfish7/custom` directory in the container when running the container: ``` -docker run -v ./custom:/opt/glassfish7/custom -p 8080:8080 -ti glassfish +docker run -v ./custom:/opt/glassfish7/custom -p 8080:8080 -ti @docker.glassfish.repository@ ``` ### Execute `asadmin` commands during Docker image build @@ -160,7 +160,7 @@ To do it, simply add `RUN instructions that run `asadmin` script with the usual File `Dockerfile`: ``` -FROM glassfish +FROM @docker.glassfish.repository@ RUN printf "start-domain \n \ set configs.config.server-config.thread-pools.thread-pool.http-thread-pool.max-thread-pool-size=1000 \n \ @@ -180,7 +180,7 @@ stop-domain File `Dockerfile`: ``` -FROM glassfish +FROM @docker.glassfish.repository@ COPY commands.asadmin commands.asadmin @@ -194,7 +194,7 @@ Let's try something more complicated. * To modify startup arguments for GlassFish, just add `startserv` to the command line and then add any arguments supported by the `asadmin start-domain` command. The `startserv` script is an alias to the `asadmin start-domain` command but starts GlassFish in a more efficient way that is more suitable in Docker container. For example, to start in debug mode with a custom domain, run: ```bash -docker run glassfish startserv --debug mydomain +docker run @docker.glassfish.repository@ startserv --debug mydomain ``` * Environment variable `AS_TRACE=true` enables tracing of the GlassFish startup. It is useful when the server doesn't start without any useful logs. @@ -204,13 +204,13 @@ docker run glassfish startserv --debug mydomain * `docker run` with `-d` starts the container as a daemon, so the shell doesn't print logs and finishes. Docker then returns the container id which you can use for further commands. ```bash -docker run -d glassfish +docker run -d @docker.glassfish.repository@ ``` Example of running a Docker container in background, view the logs, and then stop it (with debug enabled, trace logging, and user `1000` convenient for Kubernetes ): ```bash -docker run -d -e AS_TRACE=true --user 1000 glassfish startserv --debug=true +docker run -d -e AS_TRACE=true --user 1000 @docker.glassfish.repository@ startserv --debug=true 5a11f2fe1a9dd1569974de913a181847aa22165b5015ab20b271b08a27426e72 docker logs 5a11f2fe1a9dd1569974de913a181847aa22165b5015ab20b271b08a27426e72 @@ -234,7 +234,7 @@ If you want to run more complicated tests, the good path is to public class WelcomePageITest { @Container - private final GenericContainer server = new GenericContainer<>("glassfish:7.1.0").withExposedPorts(8080); + private final GenericContainer server = new GenericContainer<>("@docker.glassfish.image@").withExposedPorts(8080); @Test void getRoot() throws Exception { diff --git a/7.0.18/docs/github-repo b/src/main/resources/images/server/docs/github-repo similarity index 100% rename from 7.0.18/docs/github-repo rename to src/main/resources/images/server/docs/github-repo diff --git a/7.0.10/docs/license.md b/src/main/resources/images/server/docs/license.md similarity index 100% rename from 7.0.10/docs/license.md rename to src/main/resources/images/server/docs/license.md diff --git a/7.0.10/docs/logo.svg b/src/main/resources/images/server/docs/logo.svg similarity index 100% rename from 7.0.10/docs/logo.svg rename to src/main/resources/images/server/docs/logo.svg diff --git a/7.0.10/docs/maintainer.md b/src/main/resources/images/server/docs/maintainer.md similarity index 100% rename from 7.0.10/docs/maintainer.md rename to src/main/resources/images/server/docs/maintainer.md diff --git a/src/test/java/org/glassfish/main/distributions/docker/AsadminIT.java b/src/test/java/org/glassfish/main/distributions/docker/AsadminIT.java index 61f09c4..289815f 100644 --- a/src/test/java/org/glassfish/main/distributions/docker/AsadminIT.java +++ b/src/test/java/org/glassfish/main/distributions/docker/AsadminIT.java @@ -35,7 +35,7 @@ public class AsadminIT { @SuppressWarnings({"rawtypes", "resource"}) @Container - private final GenericContainer server = new GenericContainer<>(System.getProperty("docker.glassfish.image")) + private final GenericContainer server = new GenericContainer<>(System.getProperty("server.docker.glassfish.image")) .withCommand("asadmin start-domain").withExposedPorts(8080) .withLogConsumer(o -> System.err.print("GF: " + o.getUtf8String())); diff --git a/src/test/java/org/glassfish/main/distributions/docker/ChangePasswordsIT.java b/src/test/java/org/glassfish/main/distributions/docker/ChangePasswordsIT.java index b54549a..8a31fa2 100644 --- a/src/test/java/org/glassfish/main/distributions/docker/ChangePasswordsIT.java +++ b/src/test/java/org/glassfish/main/distributions/docker/ChangePasswordsIT.java @@ -37,7 +37,7 @@ public class ChangePasswordsIT { @SuppressWarnings({"rawtypes", "resource"}) @Container - private final GenericContainer server = new GenericContainer<>(System.getProperty("docker.glassfish.image")) + private final GenericContainer server = new GenericContainer<>(System.getProperty("server.docker.glassfish.image")) .withExposedPorts(8080, 4848) .withEnv("AS_ADMIN_MASTERPASSWORD", "mymasterpassword") .withEnv("AS_ADMIN_PASSWORD", "myadminpassword") diff --git a/src/test/java/org/glassfish/main/distributions/docker/DefaultIT.java b/src/test/java/org/glassfish/main/distributions/docker/DefaultIT.java index b744217..16ddb44 100644 --- a/src/test/java/org/glassfish/main/distributions/docker/DefaultIT.java +++ b/src/test/java/org/glassfish/main/distributions/docker/DefaultIT.java @@ -33,7 +33,7 @@ public class DefaultIT { @SuppressWarnings({"rawtypes", "resource"}) @Container - private final GenericContainer server = new GenericContainer<>(System.getProperty("docker.glassfish.image")) + private final GenericContainer server = new GenericContainer<>(System.getProperty("server.docker.glassfish.image")) .withExposedPorts(8080) .withLogConsumer(o -> System.err.print("GF: " + o.getUtf8String())); diff --git a/src/test/java/org/glassfish/main/distributions/docker/StartServIT.java b/src/test/java/org/glassfish/main/distributions/docker/StartServIT.java index 119769b..480feca 100644 --- a/src/test/java/org/glassfish/main/distributions/docker/StartServIT.java +++ b/src/test/java/org/glassfish/main/distributions/docker/StartServIT.java @@ -33,7 +33,7 @@ public class StartServIT { @SuppressWarnings({"rawtypes", "resource"}) @Container - private final GenericContainer server = new GenericContainer<>(System.getProperty("docker.glassfish.image")) + private final GenericContainer server = new GenericContainer<>(System.getProperty("server.docker.glassfish.image")) .withCommand("startserv").withExposedPorts(8080) .withLogConsumer(o -> System.err.print("GF: " + o.getUtf8String())); From 30a6a5aed4d15536c1cd05cbc38388ee4fff2c9c Mon Sep 17 00:00:00 2001 From: Ondro Mihalyi Date: Sat, 10 Jan 2026 00:26:25 +0100 Subject: [PATCH 3/9] Embedded GlassFish Docker image To do: - documentation of Embedded image - tests --- .github/workflows/docker-embedded-publish.yml | 61 ++++++++++ .github/workflows/docker-server-publish.yml | 2 +- images/embedded/7.1.0/Dockerfile | 48 ++++++++ pom.xml | 105 +++++++++++++++--- .../org/glassfish/docker/ShaGenerator.java | 3 +- src/main/resources/images/embedded/Dockerfile | 48 ++++++++ src/main/resources/images/server/Dockerfile | 2 +- 7 files changed, 251 insertions(+), 18 deletions(-) create mode 100644 .github/workflows/docker-embedded-publish.yml create mode 100644 images/embedded/7.1.0/Dockerfile create mode 100644 src/main/resources/images/embedded/Dockerfile diff --git a/.github/workflows/docker-embedded-publish.yml b/.github/workflows/docker-embedded-publish.yml new file mode 100644 index 0000000..338e1f2 --- /dev/null +++ b/.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 / + 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 + diff --git a/.github/workflows/docker-server-publish.yml b/.github/workflows/docker-server-publish.yml index cdd88be..edca8db 100644 --- a/.github/workflows/docker-server-publish.yml +++ b/.github/workflows/docker-server-publish.yml @@ -49,7 +49,7 @@ 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 diff --git a/images/embedded/7.1.0/Dockerfile b/images/embedded/7.1.0/Dockerfile new file mode 100644 index 0000000..7fab4a2 --- /dev/null +++ b/images/embedded/7.1.0/Dockerfile @@ -0,0 +1,48 @@ +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 \ + && echo "Installation was successful." + +USER glassfish +WORKDIR ${PATH_GF_HOME} +ENTRYPOINT ["java", "-jar", "glassfish-embedded-all.jar"] diff --git a/pom.xml b/pom.xml index 1cc2150..a84b602 100644 --- a/pom.xml +++ b/pom.xml @@ -13,14 +13,24 @@ 7.1.0 UTF-8 - linux/amd64,linux/arm64 - ${glassfish.version} + + linux/amd64,linux/arm64 + ${glassfish.version} eclipse-temurin:21-jdk glassfish - ${server.docker.glassfish.repository}:${docker.glassfish.tag} + ${server.docker.glassfish.repository}:${server.docker.glassfish.tag} images/server ${basedir}/${server.relative.dir} src/main/resources/${server.relative.dir} + + ${server.docker.platforms} + ${server.docker.glassfish.tag} + ${server.docker.baseImage} + embedded-glassfish + ${embedded.docker.glassfish.repository}:${embedded.docker.glassfish.tag} + images/embedded + ${basedir}/${embedded.relative.dir} + src/main/resources/${embedded.relative.dir} @@ -90,6 +100,12 @@ ${glassfish.version} zip + + org.glassfish.main.extras + glassfish-embedded-all + ${glassfish.version} + jar + @@ -108,14 +124,25 @@ 3.5.0 - computeSha512 + server.computeSha512 + + java + + process-classes + + org.glassfish.docker.ShaGenerator + ${project.build.directory}/glassfish.zip ${project.build.directory}/server.sha.properties server.sha512 + + + + embedded.computeSha512 java process-classes org.glassfish.docker.ShaGenerator - ${project.build.directory}/glassfish.zip ${project.build.directory}/sha.properties + ${project.build.directory}/glassfish-embedded-all.jar ${project.build.directory}/embedded.sha.properties embedded.sha512 @@ -135,18 +162,30 @@ org.codehaus.mojo properties-maven-plugin 1.2.1 - - - ${project.build.directory}/sha.properties - - - load-sha512 + server.load-sha512 + + read-project-properties + + prepare-package + + + ${project.build.directory}/server.sha.properties + + + + + embedded.load-sha512 read-project-properties prepare-package + + + ${project.build.directory}/embedded.sha.properties + + @@ -160,7 +199,7 @@ - filter-dockerfile + filter-server-dockerfile copy-resources @@ -187,6 +226,25 @@ + + filter-embedded-dockerfile + + copy-resources + + prepare-package + + ${embedded.images.dir}/${embedded.docker.glassfish.tag} + + + ${embedded.resources.dir} + + Dockerfile + + true + + + + @@ -210,15 +268,32 @@ - ${docker.platforms} + ${server.docker.platforms} + + + + ${server.docker.glassfish.tag} + + none + false + ${server.images.dir}/${server.docker.glassfish.tag}/Dockerfile + @ + + + + ${embedded.docker.glassfish.repository} + + + + ${embedded.docker.platforms} - ${docker.glassfish.tag} + ${embedded.docker.glassfish.tag} none false - ${server.images.dir}/${docker.glassfish.tag}/Dockerfile + ${embedded.images.dir}/${embedded.docker.glassfish.tag}/Dockerfile @ diff --git a/src/main/java/org/glassfish/docker/ShaGenerator.java b/src/main/java/org/glassfish/docker/ShaGenerator.java index 34e6694..56c4034 100644 --- a/src/main/java/org/glassfish/docker/ShaGenerator.java +++ b/src/main/java/org/glassfish/docker/ShaGenerator.java @@ -38,6 +38,7 @@ public static void main(String[] args) throws Exception { } final Path input = Paths.get(args[0]); final File properties = new File(args[1]); + final String shaPropertyName = args[2]; MessageDigest messageDigest = MessageDigest.getInstance("SHA-512"); byte[] bytes = Files.readAllBytes(input); BigInteger no = new BigInteger(1, messageDigest.digest(bytes)); @@ -46,7 +47,7 @@ public static void main(String[] args) throws Exception { hashtext = "0" + hashtext; } Properties props = new Properties(); - props.setProperty("glassfish.zip.sha512", " ".repeat(128 - hashtext.length()) + hashtext); + props.setProperty(shaPropertyName, " ".repeat(128 - hashtext.length()) + hashtext); try (FileOutputStream output = new FileOutputStream(properties)) { props.store(output, null); } diff --git a/src/main/resources/images/embedded/Dockerfile b/src/main/resources/images/embedded/Dockerfile new file mode 100644 index 0000000..8494298 --- /dev/null +++ b/src/main/resources/images/embedded/Dockerfile @@ -0,0 +1,48 @@ +FROM @embedded.docker.baseImage@ + +LABEL org.opencontainers.image.base.name="@embedded.docker.baseImage@" +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="@glassfish.version@" + +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=@embedded.sha512@ \ + GLASSFISH_VERSION=@glassfish.version@ \ + 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 \ + && echo "Installation was successful." + +USER glassfish +WORKDIR ${PATH_GF_HOME} +ENTRYPOINT ["java", "-jar", "glassfish-embedded-all.jar"] diff --git a/src/main/resources/images/server/Dockerfile b/src/main/resources/images/server/Dockerfile index 10ddba4..0cb0012 100755 --- a/src/main/resources/images/server/Dockerfile +++ b/src/main/resources/images/server/Dockerfile @@ -28,7 +28,7 @@ ENV AS_USER=${AS_ADMIN_USER} \ AS_TRACE_LOGGING=false \ AS_TRACE_BOOTSTRAP=false \ AS_STOP_TIMEOUT=9500 \ - GLASSFISH_DOWNLOAD_SHA512=@glassfish.zip.sha512@ \ + GLASSFISH_DOWNLOAD_SHA512=@server.sha512@ \ GLASSFISH_VERSION=@glassfish.version@ \ PATH_GF_BIN=${PATH_GF_HOME}/bin \ PATH_GF_SERVER_LOG="${PATH_GF_HOME}/glassfish/domains/domain1/logs/server.log" From b4292d31dc9054b07e5aa5b250f8b564d0dc1cfe Mon Sep 17 00:00:00 2001 From: Ondro Mihalyi Date: Sat, 10 Jan 2026 13:21:09 +0100 Subject: [PATCH 4/9] Documentation for Embedded GlassFish Deploy to /deploy directory for both Embedded and Server. --- images/embedded/7.1.0/Dockerfile | 1 + images/server/7.1.0/Dockerfile | 2 +- images/server/7.1.0/docs/content.md | 2 +- pom.xml | 2 +- src/main/resources/images/embedded/Dockerfile | 1 + .../images/embedded/docs/README-short.txt | 2 + .../resources/images/embedded/docs/content.md | 175 ++++++++++++ .../images/embedded/docs/github-repo | 1 + .../resources/images/embedded/docs/license.md | 262 ++++++++++++++++++ .../resources/images/embedded/docs/logo.svg | 35 +++ .../images/embedded/docs/maintainer.md | 1 + src/main/resources/images/server/Dockerfile | 2 +- .../resources/images/server/docs/content.md | 6 +- 13 files changed, 485 insertions(+), 7 deletions(-) create mode 100644 src/main/resources/images/embedded/docs/README-short.txt create mode 100644 src/main/resources/images/embedded/docs/content.md create mode 100644 src/main/resources/images/embedded/docs/github-repo create mode 100644 src/main/resources/images/embedded/docs/license.md create mode 100644 src/main/resources/images/embedded/docs/logo.svg create mode 100644 src/main/resources/images/embedded/docs/maintainer.md diff --git a/images/embedded/7.1.0/Dockerfile b/images/embedded/7.1.0/Dockerfile index 7fab4a2..c660cce 100644 --- a/images/embedded/7.1.0/Dockerfile +++ b/images/embedded/7.1.0/Dockerfile @@ -41,6 +41,7 @@ RUN true \ && 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 diff --git a/images/server/7.1.0/Dockerfile b/images/server/7.1.0/Dockerfile index daa4e32..2f92f3c 100755 --- a/images/server/7.1.0/Dockerfile +++ b/images/server/7.1.0/Dockerfile @@ -74,7 +74,7 @@ RUN true \ && asadmin stop-domain --kill \ && rm -f ${PATH_GF_SERVER_LOG} ${PATH_GF_PASSWORD_FILE_FOR_CHANGE} \ && chown -R glassfish:glassfish "${PATH_GF_HOME}" \ - && mkdir ${PATH_GF_HOME}/autodeploy \ + && 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 diff --git a/images/server/7.1.0/docs/content.md b/images/server/7.1.0/docs/content.md index fdc6a05..d65696d 100644 --- a/images/server/7.1.0/docs/content.md +++ b/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%% diff --git a/pom.xml b/pom.xml index a84b602..449eab5 100644 --- a/pom.xml +++ b/pom.xml @@ -205,7 +205,7 @@ prepare-package - ${server.images.dir}/${docker.glassfish.tag} + ${server.images.dir}/${server.docker.glassfish.tag} ${server.resources.dir} diff --git a/src/main/resources/images/embedded/Dockerfile b/src/main/resources/images/embedded/Dockerfile index 8494298..9a12017 100644 --- a/src/main/resources/images/embedded/Dockerfile +++ b/src/main/resources/images/embedded/Dockerfile @@ -41,6 +41,7 @@ RUN true \ && 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 diff --git a/src/main/resources/images/embedded/docs/README-short.txt b/src/main/resources/images/embedded/docs/README-short.txt new file mode 100644 index 0000000..df7fb57 --- /dev/null +++ b/src/main/resources/images/embedded/docs/README-short.txt @@ -0,0 +1,2 @@ +Embedded Eclipse GlassFish is a Jakarta EE runtime based on GlassFish server, embeddable and executable as a JAR. + diff --git a/src/main/resources/images/embedded/docs/content.md b/src/main/resources/images/embedded/docs/content.md new file mode 100644 index 0000000..50ba034 --- /dev/null +++ b/src/main/resources/images/embedded/docs/content.md @@ -0,0 +1,175 @@ +# Eclipse GlassFish Embedded Docker Image + +[Eclipse GlassFish](https://glassfish.org) is a Jakarta EE compatible implementation. This is the **Embedded** version that runs as a single JAR file without requiring a full server installation. + +%%LOGO%% + +**Source code repository of the Docker image:** https://github.com/eclipse-ee4j/glassfish.docker + +## Quick start + +### Start GlassFish Embedded + +Run GlassFish Embedded with the following command: + +``` +docker run -p 8080:8080 @docker.glassfish.embedded.repository@ +``` + +Or with a command for a specific tag (GlassFish version): + +``` +docker run -p 8080:8080 @docker.glassfish.embedded.image@ +``` + +Open the following URL in the browser to access the HTTP port: + +* http://localhost:8080 + +**Note:** GlassFish Embedded does not include the Administration Console. Use the full GlassFish Server image if you need administrative capabilities. + +### Stop GlassFish Embedded + +Stop GlassFish Embedded with the following command: + +``` +docker stop CONTAINER_ID +``` + +CONTAINER_ID can be found from the output of the following command: + +``` +docker ps +``` + +## Run an application with GlassFish Embedded in Docker + +You can run an application located in your filesystem with GlassFish Embedded in a Docker container. + +Follow these steps: + +1. Create an empty directory on your filesystem, e.g. `/deployments` +2. Copy the application package to this directory - so that it's for example on the path `/deployments/application.war` +3. Run the following command to start GlassFish Embedded in Docker with your application, where /deployments is the directory created in step 1 and /deploy is the directory inside the container where Embedded GlassFish expects applications: + +``` +docker run -p 8080:8080 -v /deployments:/deploy @docker.glassfish.embedded.repository@ +``` + +Then you can open the application in the browser with: + +* http://localhost:8080 + +If there's a single application, if will be available under the roo (`/`) context root. If there are multiple applications, each will be available under a context root derived from the name of the application file (e.g. `application.war` would be deployed under the `/application` context root). + +## Debug GlassFish Embedded inside a Docker container + +You can enable debug mode by specifying JVM debug arguments in the standard `JAVA_TOOL_OPTIONS` environment variable and expose the debug port. For example: + +``` +docker run -p 9009:9009 -p 8080:8080 -e 'JAVA_TOOL_OPTIONS=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:9009' @docker.glassfish.embedded.repository@ +``` + +Then connect your debugger to port 9009 on `localhost`. + +If you need to suspend GlassFish startup until you connect the debugger, change `suspend=n` to `suspend=y`: + +``` +docker run -p 9009:9009 -p 8080:8080 -e 'JAVA_TOOL_OPTIONS=-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=*:9009' @docker.glassfish.embedded.repository@ +``` + +## Environment variables + +The following environment variables are available: + +* `PATH_GF_HOME` - directory that contains Embedded GlassFish JAR and is used as the default working directory (`/opt/glassfish`) +* `PATH_GF_JAR` - path to the Embedded GlassFish JAR file +* `GLASSFISH_VERSION` - version of GlassFish + +## Additional configuration + +### Custom JVM arguments + +You can pass custom JVM arguments by setting them in the standard `JAVA_TOOL_OPTIONS` variable + +``` +docker run -p 8080:8080 -e 'JAVA_TOOL_OPTIONS=-Xmx512m -Dmy.property=value' @docker.glassfish.embedded.repository@ +``` + +### Custom application deployment + +Applications placed in the `/deploy` directory will be automatically deployed at startup: + +``` +docker run -p 8080:8080 -v /path/to/apps:/deploy @docker.glassfish.embedded.repository@ +``` + +Paths to applications in different locations can be passed on command line, e.g.: + +``` +docker run -p 8080:8080 @docker.glassfish.embedded.repository@ /mydeployments/myapp.war +``` + +NOTE: If you point to a path on the command line, the path must exist inside the container. If it's not there, mount a local directory, e.g. using the `-v` option. + +### Using with custom Dockerfile + +You can create a custom Docker image based on GlassFish Embedded: + +```dockerfile +FROM @docker.glassfish.embedded.repository@ + +# Copy your application +COPY myapp.war /deploy/ + +# Set custom JVM options +ENV JAVA_TOOL_OPTIONS=-Xmx512m +``` + +## Examples of advanced usage + +### Running with specific JVM settings + +```bash +docker run -p 8080:8080 -e JAVA_TOOL_OPTIONS='-Xmx1g -XX:+UseG1GC' @docker.glassfish.embedded.repository@ +``` + +### Running in background with logs + +```bash +docker run -d -p 8080:8080 @docker.glassfish.embedded.repository@ +CONTAINER_ID=$(docker ps -q --filter ancestor=@docker.glassfish.embedded.repository@) +docker logs -f $CONTAINER_ID +``` + +### Running with custom user (useful for Kubernetes) + +```bash +docker run --user 1000 -p 8080:8080 @docker.glassfish.embedded.repository@ +``` + +## TestContainers + +This is a simple test example using [Embedded GlassFish ](https://glassfish.org/) and [TestContainers](https://www.testcontainers.org/): + +```java +@Testcontainers +public class EmbeddedGlassFishITest { + + @Container + private final GenericContainer server = new GenericContainer<>("@docker.glassfish.embedded.image@") + .withExposedPorts(8080); + + @Test + void testServerStartup() throws Exception { + URL url = new URL("http://localhost:" + server.getMappedPort(8080) + "/"); + HttpURLConnection connection = (HttpURLConnection) url.openConnection(); + try { + connection.setRequestMethod("GET"); + assertEquals(200, connection.getResponseCode()); + } finally { + connection.disconnect(); + } + } +} +``` \ No newline at end of file diff --git a/src/main/resources/images/embedded/docs/github-repo b/src/main/resources/images/embedded/docs/github-repo new file mode 100644 index 0000000..82e2a5f --- /dev/null +++ b/src/main/resources/images/embedded/docs/github-repo @@ -0,0 +1 @@ +https://github.com/eclipse-ee4j/glassfish.docker diff --git a/src/main/resources/images/embedded/docs/license.md b/src/main/resources/images/embedded/docs/license.md new file mode 100644 index 0000000..ae1a2d5 --- /dev/null +++ b/src/main/resources/images/embedded/docs/license.md @@ -0,0 +1,262 @@ +# Eclipse Public License - v 2.0 + +THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. + +1. DEFINITIONS + +"Contribution" means: + +a) in the case of the initial Contributor, the initial content + + Distributed under this Agreement, and + +b) in the case of each subsequent Contributor: + + i) changes to the Program, and + ii) additions to the Program; + +where such changes and/or additions to the Program originate from and are Distributed by that particular Contributor. A Contribution "originates" from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include changes or additions to the Program that are not Modified Works. + +"Contributor" means any person or entity that Distributes the Program. + +"Licensed Patents" mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program. + +"Program" means the Contributions Distributed in accordance with this Agreement. + +"Recipient" means anyone who receives the Program under this Agreement or any Secondary License (as applicable), including Contributors. + +"Derivative Works" shall mean any work, whether in Source Code or other form, that is based on (or derived from) the Program and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. + +"Modified Works" shall mean any work in Source Code or other form that results from an addition to, deletion from, or modification of the contents of the Program, including, for purposes of clarity any new file in Source Code form that contains any contents of the Program. Modified Works shall not include works that contain only declarations, interfaces, types, classes, structures, or files of the Program solely in each case in order to link to, bind by name, or subclass the Program or Modified Works thereof. + +"Distribute" means the acts of a) distributing or b) making available in any manner that enables the transfer of a copy. + +"Source Code" means the form of a Program preferred for making modifications, including but not limited to software source code, documentation source, and configuration files. + +"Secondary License" means either the GNU General Public License, Version 2.0, or any later versions of that license, including any exceptions or additional permissions as identified by the initial Contributor. + +1. GRANT OF RIGHTS + +a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, Distribute and sublicense the Contribution of such Contributor, if any, and such Derivative Works. + +b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in Source Code or other form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder. + +c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to Distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program. + +d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement. + +e) Notwithstanding the terms of any Secondary License, no Contributor makes additional grants to any Recipient (other than those set forth in this Agreement) as a result of such Recipient's receipt of the Program under the terms of a Secondary License (if permitted under the terms of Section 3). + +1. REQUIREMENTS + +3.1 If a Contributor Distributes the Program in any form, then: + +a) the Program must also be made available as Source Code, in accordance with section 3.2, and the Contributor must accompany the Program with a statement that the Source Code for the Program is available under this Agreement, and informs Recipients how to obtain it in a reasonable manner on or through a medium customarily used for software exchange; and + +b) the Contributor may Distribute the Program under a license different than this Agreement, provided that such license: + + i) effectively disclaims on behalf of all other Contributors all + warranties and conditions, express and implied, including + warranties or conditions of title and non-infringement, and + implied warranties or conditions of merchantability and fitness + for a particular purpose; + + ii) effectively excludes on behalf of all other Contributors all + liability for damages, including direct, indirect, special, + incidental and consequential damages, such as lost profits; + + iii) does not attempt to limit or alter the recipients' rights + in the Source Code under section 3.2; and + + iv) requires any subsequent distribution of the Program by any + party to be under a license that satisfies the requirements + of this section 3. + +3.2 When the Program is Distributed as Source Code: + +a) it must be made available under this Agreement, or if the Program (i) is combined with other material in a separate file or files made available under a Secondary License, and (ii) the initial Contributor attached to the Source Code the notice described in Exhibit A of this Agreement, then the Program may be made available under the terms of such Secondary Licenses, and + +b) a copy of this Agreement must be included with each copy of the Program. + +3.3 Contributors may not remove or alter any copyright, patent, trademark, attribution notices, disclaimers of warranty, or limitations of liability ("notices") contained within the Program from any copy of the Program which they Distribute, provided that Contributors may add their own appropriate notices. + +1. COMMERCIAL DISTRIBUTION + +Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense. + +For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages. + +1. NO WARRANTY + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement, including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations. + +1. DISCLAIMER OF LIABILITY + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +1. GENERAL + +If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable. + +If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed. + +All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive. + +Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be Distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to Distribute the Program (including its Contributions) under the new version. + +Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved. Nothing in this Agreement is intended to be enforceable by any entity that is not a Contributor or Recipient. No third-party beneficiary rights are created under this Agreement. + +Exhibit A - Form of Secondary Licenses Notice + +"This Source Code may also be made available under the following Secondary Licenses when the conditions for such availability set forth in the Eclipse Public License, v. 2.0 are satisfied: {name license(s), version(s), and exceptions or additional permissions here}." + +Simply including a copy of this Agreement, including this Exhibit A is not sufficient to license the Source Code under Secondary Licenses. + +If it is not possible or desirable to put the notice in a particular file, then You may include the notice in a location (such as a LICENSE file in a relevant directory) where a recipient would be likely to look for such a notice. + +You may add additional accurate notices of copyright ownership. + +--- + +## The GNU General Public License (GPL) Version 2, June 1991 + +Copyright (C) 1989, 1991 Free Software Foundation, Inc. 51 Franklin Street, Fifth Floor Boston, MA 02110-1335 USA + +Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. + +Preamble + +The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Library General Public License instead.) You can apply it to your programs, too. + +When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. + +To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it. + +For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. + +We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software. + +Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations. + +Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. + +The precise terms and conditions for copying, distribution and modification follow. + +TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + +1. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. + +1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program. + +You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. + +1. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. + + c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. + +1. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. + +If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. + +1. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. + +2. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. + +3. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. + +4. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. + +This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. + +1. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. + +2. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. + +1. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. + +NO WARRANTY + +1. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + +2. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +END OF TERMS AND CONDITIONS + +How to Apply These Terms to Your New Programs + +If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. + +To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. + + One line to give the program's name and a brief idea of what it does. + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type + `show w'. This is free software, and you are welcome to redistribute + it under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and`show c' should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than `show w' and`show c'; they could even be mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + program `Gnomovision' (which makes passes at compilers) written by + James Hacker. + + signature of Ty Coon, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Library General Public License instead of this License. + +--- + +## CLASSPATH EXCEPTION + +Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and conditions of the GNU General Public License version 2 cover the whole combination. + +As a special exception, the copyright holders of this library give you permission to link this library with independent modules to produce an executable, regardless of the license terms of these independent modules, and to copy and distribute the resulting executable under terms of your choice, provided that you also meet, for each linked independent module, the terms and conditions of the license of that module. An independent module is a module which is not derived from or based on this library. If you modify this library, you may extend this exception to your version of the library, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/src/main/resources/images/embedded/docs/logo.svg b/src/main/resources/images/embedded/docs/logo.svg new file mode 100644 index 0000000..55b2329 --- /dev/null +++ b/src/main/resources/images/embedded/docs/logo.svg @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/images/embedded/docs/maintainer.md b/src/main/resources/images/embedded/docs/maintainer.md new file mode 100644 index 0000000..e727ff0 --- /dev/null +++ b/src/main/resources/images/embedded/docs/maintainer.md @@ -0,0 +1 @@ +../.common-templates/maintainer-community.md \ No newline at end of file diff --git a/src/main/resources/images/server/Dockerfile b/src/main/resources/images/server/Dockerfile index 0cb0012..c7cb769 100755 --- a/src/main/resources/images/server/Dockerfile +++ b/src/main/resources/images/server/Dockerfile @@ -74,7 +74,7 @@ RUN true \ && asadmin stop-domain --kill \ && rm -f ${PATH_GF_SERVER_LOG} ${PATH_GF_PASSWORD_FILE_FOR_CHANGE} \ && chown -R glassfish:glassfish "${PATH_GF_HOME}" \ - && mkdir ${PATH_GF_HOME}/autodeploy \ + && 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 diff --git a/src/main/resources/images/server/docs/content.md b/src/main/resources/images/server/docs/content.md index fdc6a05..57ac3ad 100644 --- a/src/main/resources/images/server/docs/content.md +++ b/src/main/resources/images/server/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%% @@ -49,10 +49,10 @@ 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:/opt/glassfish7/glassfish/domains/domain1/autodeploy @docker.glassfish.repository@ +docker run -p 8080:8080 -p 4848:4848 -v /deployments:/deploy @docker.glassfish.repository@ ``` Then you can open the application in the browser with: From 0100afe9ea29d681028c86c52f43f8c50f672da0 Mon Sep 17 00:00:00 2001 From: Ondro Mihalyi Date: Sat, 10 Jan 2026 13:21:36 +0100 Subject: [PATCH 5/9] Move server IT tests under server tests --- .../main/distributions/docker/{ => server}/AsadminIT.java | 4 ++-- .../docker/{ => server}/ChangePasswordsIT.java | 6 +++--- .../main/distributions/docker/{ => server}/DefaultIT.java | 4 ++-- .../distributions/docker/{ => server}/HttpUtilities.java | 2 +- .../main/distributions/docker/{ => server}/StartServIT.java | 4 ++-- .../distributions/docker/{ => server}/UserPassword.java | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) rename src/test/java/org/glassfish/main/distributions/docker/{ => server}/AsadminIT.java (92%) rename src/test/java/org/glassfish/main/distributions/docker/{ => server}/ChangePasswordsIT.java (90%) rename src/test/java/org/glassfish/main/distributions/docker/{ => server}/DefaultIT.java (92%) rename src/test/java/org/glassfish/main/distributions/docker/{ => server}/HttpUtilities.java (98%) rename src/test/java/org/glassfish/main/distributions/docker/{ => server}/StartServIT.java (92%) rename src/test/java/org/glassfish/main/distributions/docker/{ => server}/UserPassword.java (93%) diff --git a/src/test/java/org/glassfish/main/distributions/docker/AsadminIT.java b/src/test/java/org/glassfish/main/distributions/docker/server/AsadminIT.java similarity index 92% rename from src/test/java/org/glassfish/main/distributions/docker/AsadminIT.java rename to src/test/java/org/glassfish/main/distributions/docker/server/AsadminIT.java index 289815f..2560e7c 100644 --- a/src/test/java/org/glassfish/main/distributions/docker/AsadminIT.java +++ b/src/test/java/org/glassfish/main/distributions/docker/server/AsadminIT.java @@ -13,7 +13,7 @@ * * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.glassfish.main.distributions.docker; +package org.glassfish.main.distributions.docker.server; import java.net.http.HttpResponse; @@ -25,7 +25,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.stringContainsInOrder; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.glassfish.main.distributions.docker.HttpUtilities.getServerDefaultRoot; +import static org.glassfish.main.distributions.docker.server.HttpUtilities.getServerDefaultRoot; /** * diff --git a/src/test/java/org/glassfish/main/distributions/docker/ChangePasswordsIT.java b/src/test/java/org/glassfish/main/distributions/docker/server/ChangePasswordsIT.java similarity index 90% rename from src/test/java/org/glassfish/main/distributions/docker/ChangePasswordsIT.java rename to src/test/java/org/glassfish/main/distributions/docker/server/ChangePasswordsIT.java index 8a31fa2..d3a3e37 100644 --- a/src/test/java/org/glassfish/main/distributions/docker/ChangePasswordsIT.java +++ b/src/test/java/org/glassfish/main/distributions/docker/server/ChangePasswordsIT.java @@ -13,7 +13,7 @@ * * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.glassfish.main.distributions.docker; +package org.glassfish.main.distributions.docker.server; import java.net.http.HttpResponse; @@ -22,11 +22,11 @@ import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; -import static org.glassfish.main.distributions.docker.HttpUtilities.getServerDefaultRoot; +import static org.glassfish.main.distributions.docker.server.HttpUtilities.getServerDefaultRoot; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.stringContainsInOrder; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.glassfish.main.distributions.docker.HttpUtilities.getAdminResource; +import static org.glassfish.main.distributions.docker.server.HttpUtilities.getAdminResource; /** * diff --git a/src/test/java/org/glassfish/main/distributions/docker/DefaultIT.java b/src/test/java/org/glassfish/main/distributions/docker/server/DefaultIT.java similarity index 92% rename from src/test/java/org/glassfish/main/distributions/docker/DefaultIT.java rename to src/test/java/org/glassfish/main/distributions/docker/server/DefaultIT.java index 16ddb44..dfc1267 100644 --- a/src/test/java/org/glassfish/main/distributions/docker/DefaultIT.java +++ b/src/test/java/org/glassfish/main/distributions/docker/server/DefaultIT.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.glassfish.main.distributions.docker; +package org.glassfish.main.distributions.docker.server; import java.net.http.HttpResponse; @@ -23,7 +23,7 @@ import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; -import static org.glassfish.main.distributions.docker.HttpUtilities.getServerDefaultRoot; +import static org.glassfish.main.distributions.docker.server.HttpUtilities.getServerDefaultRoot; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.stringContainsInOrder; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/src/test/java/org/glassfish/main/distributions/docker/HttpUtilities.java b/src/test/java/org/glassfish/main/distributions/docker/server/HttpUtilities.java similarity index 98% rename from src/test/java/org/glassfish/main/distributions/docker/HttpUtilities.java rename to src/test/java/org/glassfish/main/distributions/docker/server/HttpUtilities.java index 4755993..c71c28b 100644 --- a/src/test/java/org/glassfish/main/distributions/docker/HttpUtilities.java +++ b/src/test/java/org/glassfish/main/distributions/docker/server/HttpUtilities.java @@ -13,7 +13,7 @@ * * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.glassfish.main.distributions.docker; +package org.glassfish.main.distributions.docker.server; import java.net.URI; import java.net.http.HttpClient; diff --git a/src/test/java/org/glassfish/main/distributions/docker/StartServIT.java b/src/test/java/org/glassfish/main/distributions/docker/server/StartServIT.java similarity index 92% rename from src/test/java/org/glassfish/main/distributions/docker/StartServIT.java rename to src/test/java/org/glassfish/main/distributions/docker/server/StartServIT.java index 480feca..e210db6 100644 --- a/src/test/java/org/glassfish/main/distributions/docker/StartServIT.java +++ b/src/test/java/org/glassfish/main/distributions/docker/server/StartServIT.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.glassfish.main.distributions.docker; +package org.glassfish.main.distributions.docker.server; import java.net.http.HttpResponse; @@ -23,7 +23,7 @@ import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; -import static org.glassfish.main.distributions.docker.HttpUtilities.getServerDefaultRoot; +import static org.glassfish.main.distributions.docker.server.HttpUtilities.getServerDefaultRoot; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.stringContainsInOrder; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/src/test/java/org/glassfish/main/distributions/docker/UserPassword.java b/src/test/java/org/glassfish/main/distributions/docker/server/UserPassword.java similarity index 93% rename from src/test/java/org/glassfish/main/distributions/docker/UserPassword.java rename to src/test/java/org/glassfish/main/distributions/docker/server/UserPassword.java index 194be95..ce52abc 100644 --- a/src/test/java/org/glassfish/main/distributions/docker/UserPassword.java +++ b/src/test/java/org/glassfish/main/distributions/docker/server/UserPassword.java @@ -13,7 +13,7 @@ * * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.glassfish.main.distributions.docker; +package org.glassfish.main.distributions.docker.server; /** * From 8e7b580f9b2af768ad5e68d63c2858936b17aadb Mon Sep 17 00:00:00 2001 From: Ondro Mihalyi Date: Sat, 10 Jan 2026 14:38:46 +0100 Subject: [PATCH 6/9] Test for Embedded GlassFish --- images/server/7.1.0/docs/content.md | 4 +- pom.xml | 20 ++++++ .../resources/images/embedded/docs/content.md | 18 ++++- .../resources/images/server/docs/content.md | 8 +++ .../docker/embedded/EmbeddedDeploymentIT.java | 72 +++++++++++++++++++ .../docker/server/AsadminIT.java | 2 +- .../docker/server/ChangePasswordsIT.java | 4 +- .../docker/server/DefaultIT.java | 2 +- .../docker/server/StartServIT.java | 2 +- .../{server => testutils}/HttpUtilities.java | 17 +++-- src/test/webapp/WEB-INF/web.xml | 7 ++ src/test/webapp/index.html | 6 ++ 12 files changed, 150 insertions(+), 12 deletions(-) create mode 100644 src/test/java/org/glassfish/main/distributions/docker/embedded/EmbeddedDeploymentIT.java rename src/test/java/org/glassfish/main/distributions/docker/{server => testutils}/HttpUtilities.java (79%) create mode 100644 src/test/webapp/WEB-INF/web.xml create mode 100644 src/test/webapp/index.html diff --git a/images/server/7.1.0/docs/content.md b/images/server/7.1.0/docs/content.md index d65696d..57ac3ad 100644 --- a/images/server/7.1.0/docs/content.md +++ b/images/server/7.1.0/docs/content.md @@ -49,10 +49,10 @@ 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:/opt/glassfish7/glassfish/domains/domain1/autodeploy @docker.glassfish.repository@ +docker run -p 8080:8080 -p 4848:4848 -v /deployments:/deploy @docker.glassfish.repository@ ``` Then you can open the application in the browser with: diff --git a/pom.xml b/pom.xml index 449eab5..68c6b02 100644 --- a/pom.xml +++ b/pom.xml @@ -319,6 +319,25 @@ + + maven-war-plugin + 3.4.0 + + + build-test-app + test-compile + + war + + + src/test/webapp + ${project.build.directory}/test-classes + application + test + + + + @@ -346,6 +365,7 @@ ${server.docker.glassfish.image} + ${embedded.docker.glassfish.image} **/*IT.java diff --git a/src/main/resources/images/embedded/docs/content.md b/src/main/resources/images/embedded/docs/content.md index 50ba034..398d138 100644 --- a/src/main/resources/images/embedded/docs/content.md +++ b/src/main/resources/images/embedded/docs/content.md @@ -56,6 +56,14 @@ Follow these steps: docker run -p 8080:8080 -v /deployments:/deploy @docker.glassfish.embedded.repository@ ``` +Alternatively, you can mount a specific WAR file directly: + +``` +docker run -p 8080:8080 -v /deployments/application.war:/deploy/application.war @docker.glassfish.embedded.repository@ +``` + +**Note**: When deploying a single application, GlassFish Embedded automatically deploys it at the root context (`/`) rather than using the WAR filename as the context path. + Then you can open the application in the browser with: * http://localhost:8080 @@ -98,12 +106,20 @@ docker run -p 8080:8080 -e 'JAVA_TOOL_OPTIONS=-Xmx512m -Dmy.property=value' @doc ### Custom application deployment -Applications placed in the `/deploy` directory will be automatically deployed at startup: +Applications placed in the `/deploy` directory will be automatically deployed at startup. You can either: +- Mount a directory containing WAR files: ``` docker run -p 8080:8080 -v /path/to/apps:/deploy @docker.glassfish.embedded.repository@ ``` +- Mount a specific WAR file directly: +``` +docker run -p 8080:8080 -v /path/to/myapp.war:/deploy/myapp.war @docker.glassfish.embedded.repository@ +``` + +**Note**: When deploying a single application, GlassFish Embedded automatically deploys it at the root context (`/`) rather than using the WAR filename as the context path. + Paths to applications in different locations can be passed on command line, e.g.: ``` diff --git a/src/main/resources/images/server/docs/content.md b/src/main/resources/images/server/docs/content.md index 57ac3ad..42cc286 100644 --- a/src/main/resources/images/server/docs/content.md +++ b/src/main/resources/images/server/docs/content.md @@ -55,6 +55,14 @@ Follow these steps: 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 /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 diff --git a/src/test/java/org/glassfish/main/distributions/docker/embedded/EmbeddedDeploymentIT.java b/src/test/java/org/glassfish/main/distributions/docker/embedded/EmbeddedDeploymentIT.java new file mode 100644 index 0000000..45b7940 --- /dev/null +++ b/src/test/java/org/glassfish/main/distributions/docker/embedded/EmbeddedDeploymentIT.java @@ -0,0 +1,72 @@ +/* + * Copyright (c) 2025 Contributors to the Eclipse Foundation. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v. 2.0, which is available at + * http://www.eclipse.org/legal/epl-2.0. + * + * This Source Code may also be made available under the following Secondary + * Licenses when the conditions for such availability set forth in the + * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, + * version 2 with the GNU Classpath Exception, which is available at + * https://www.gnu.org/software/classpath/license.html. + * + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 + */ + +package org.glassfish.main.distributions.docker.embedded; + +import java.net.http.HttpResponse; +import java.time.Duration; + +import org.junit.jupiter.api.Test; +import org.testcontainers.containers.BindMode; +import org.testcontainers.containers.GenericContainer; +import org.testcontainers.containers.wait.strategy.Wait; +import org.testcontainers.junit.jupiter.Container; +import org.testcontainers.junit.jupiter.Testcontainers; + +import static org.glassfish.main.distributions.docker.testutils.HttpUtilities.getEmbeddedApplication; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +@Testcontainers +public class EmbeddedDeploymentIT { + + @SuppressWarnings({"rawtypes", "resource"}) + @Container + private final GenericContainer server = new GenericContainer<>(System.getProperty("embedded.docker.glassfish.image")) + .withExposedPorts(8080) + .withFileSystemBind("target/test-classes/application-test.war", "/deploy/application.war", BindMode.READ_ONLY) + .waitingFor(Wait.forListeningPort().withStartupTimeout(Duration.ofMinutes(2))) + .withLogConsumer(o -> System.err.print("GF-Embedded: " + o.getUtf8String())); + + @Test + void deployedApplicationIsAccessible() throws Exception { + // Wait for the GLASSFISH STARTED message in logs + long startTime = System.currentTimeMillis(); + boolean glassfishStarted = false; + while (!glassfishStarted && (System.currentTimeMillis() - startTime) < 120000) { // 2 minutes + String logs = server.getLogs(); + if (logs.contains("GLASSFISH STARTED")) { + glassfishStarted = true; + } else { + Thread.sleep(1000); // Wait 1 second before checking again + } + } + + if (!glassfishStarted) { + System.err.println("Full logs: " + server.getLogs()); + throw new RuntimeException("GlassFish did not start within 2 minutes"); + } + + System.err.println("GlassFish started successfully, checking application deployment..."); + + // Verify the application is deployed by checking if it's accessible + final HttpResponse appResponse = getEmbeddedApplication(server, "/index.html"); + System.err.println("Response status: " + appResponse.statusCode()); + System.err.println("Response body: " + appResponse.body()); + assertEquals(200, appResponse.statusCode(), "Application response status code"); + assertTrue(appResponse.body().contains("Hello from test app"), "Application should return Hello message"); + } +} diff --git a/src/test/java/org/glassfish/main/distributions/docker/server/AsadminIT.java b/src/test/java/org/glassfish/main/distributions/docker/server/AsadminIT.java index 2560e7c..72e40c1 100644 --- a/src/test/java/org/glassfish/main/distributions/docker/server/AsadminIT.java +++ b/src/test/java/org/glassfish/main/distributions/docker/server/AsadminIT.java @@ -25,7 +25,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.stringContainsInOrder; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.glassfish.main.distributions.docker.server.HttpUtilities.getServerDefaultRoot; +import static org.glassfish.main.distributions.docker.testutils.HttpUtilities.getServerDefaultRoot; /** * diff --git a/src/test/java/org/glassfish/main/distributions/docker/server/ChangePasswordsIT.java b/src/test/java/org/glassfish/main/distributions/docker/server/ChangePasswordsIT.java index d3a3e37..e4ff885 100644 --- a/src/test/java/org/glassfish/main/distributions/docker/server/ChangePasswordsIT.java +++ b/src/test/java/org/glassfish/main/distributions/docker/server/ChangePasswordsIT.java @@ -22,11 +22,11 @@ import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; -import static org.glassfish.main.distributions.docker.server.HttpUtilities.getServerDefaultRoot; +import static org.glassfish.main.distributions.docker.testutils.HttpUtilities.getServerDefaultRoot; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.stringContainsInOrder; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.glassfish.main.distributions.docker.server.HttpUtilities.getAdminResource; +import static org.glassfish.main.distributions.docker.testutils.HttpUtilities.getAdminResource; /** * diff --git a/src/test/java/org/glassfish/main/distributions/docker/server/DefaultIT.java b/src/test/java/org/glassfish/main/distributions/docker/server/DefaultIT.java index dfc1267..dd0737d 100644 --- a/src/test/java/org/glassfish/main/distributions/docker/server/DefaultIT.java +++ b/src/test/java/org/glassfish/main/distributions/docker/server/DefaultIT.java @@ -23,7 +23,7 @@ import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; -import static org.glassfish.main.distributions.docker.server.HttpUtilities.getServerDefaultRoot; +import static org.glassfish.main.distributions.docker.testutils.HttpUtilities.getServerDefaultRoot; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.stringContainsInOrder; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/src/test/java/org/glassfish/main/distributions/docker/server/StartServIT.java b/src/test/java/org/glassfish/main/distributions/docker/server/StartServIT.java index e210db6..17c9538 100644 --- a/src/test/java/org/glassfish/main/distributions/docker/server/StartServIT.java +++ b/src/test/java/org/glassfish/main/distributions/docker/server/StartServIT.java @@ -23,7 +23,7 @@ import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; -import static org.glassfish.main.distributions.docker.server.HttpUtilities.getServerDefaultRoot; +import static org.glassfish.main.distributions.docker.testutils.HttpUtilities.getServerDefaultRoot; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.stringContainsInOrder; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/src/test/java/org/glassfish/main/distributions/docker/server/HttpUtilities.java b/src/test/java/org/glassfish/main/distributions/docker/testutils/HttpUtilities.java similarity index 79% rename from src/test/java/org/glassfish/main/distributions/docker/server/HttpUtilities.java rename to src/test/java/org/glassfish/main/distributions/docker/testutils/HttpUtilities.java index c71c28b..5d143da 100644 --- a/src/test/java/org/glassfish/main/distributions/docker/server/HttpUtilities.java +++ b/src/test/java/org/glassfish/main/distributions/docker/testutils/HttpUtilities.java @@ -13,7 +13,7 @@ * * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.glassfish.main.distributions.docker.server; +package org.glassfish.main.distributions.docker.testutils; import java.net.URI; import java.net.http.HttpClient; @@ -29,6 +29,7 @@ import javax.net.ssl.TrustManager; import javax.net.ssl.X509TrustManager; +import org.glassfish.main.distributions.docker.server.UserPassword; import org.testcontainers.containers.GenericContainer; import static java.net.http.HttpResponse.BodyHandlers.ofString; @@ -42,7 +43,7 @@ public final class HttpUtilities { private HttpUtilities() { } - static HttpResponse getServerDefaultRoot(GenericContainer server) throws Exception { + public static HttpResponse getServerDefaultRoot(GenericContainer server) throws Exception { URI uri = URI.create("http://localhost:" + server.getMappedPort(8080) + "/"); try (HttpClient client = newInsecureHttpClient()) { final HttpRequest request = HttpRequest.newBuilder(uri).build(); @@ -50,7 +51,7 @@ static HttpResponse getServerDefaultRoot(GenericContainer server) throws } } - static HttpResponse getEmbeddedDefaultRoot(GenericContainer server) throws Exception { + public static HttpResponse getEmbeddedDefaultRoot(GenericContainer server) throws Exception { URI uri = URI.create("http://localhost:" + server.getMappedPort(8080) + "/"); try (HttpClient client = newInsecureHttpClient()) { final HttpRequest request = HttpRequest.newBuilder(uri).build(); @@ -58,7 +59,15 @@ static HttpResponse getEmbeddedDefaultRoot(GenericContainer server) thro } } - static HttpResponse getAdminResource(GenericContainer server, String resourcePath, UserPassword userPass) throws Exception { + public static HttpResponse getEmbeddedApplication(GenericContainer server, String appPath) throws Exception { + URI uri = URI.create("http://localhost:" + server.getMappedPort(8080) + appPath); + try (HttpClient client = newInsecureHttpClient()) { + final HttpRequest request = HttpRequest.newBuilder(uri).build(); + return client.send(request, ofString(StandardCharsets.UTF_8)); + } + } + + public static HttpResponse getAdminResource(GenericContainer server, String resourcePath, UserPassword userPass) throws Exception { URI uri = URI.create("https://localhost:" + server.getMappedPort(4848) + resourcePath); try (HttpClient client = newInsecureHttpClient()) { final HttpRequest request = HttpRequest.newBuilder(uri) diff --git a/src/test/webapp/WEB-INF/web.xml b/src/test/webapp/WEB-INF/web.xml new file mode 100644 index 0000000..f7ed758 --- /dev/null +++ b/src/test/webapp/WEB-INF/web.xml @@ -0,0 +1,7 @@ + + + Test Application + diff --git a/src/test/webapp/index.html b/src/test/webapp/index.html new file mode 100644 index 0000000..8d8bd14 --- /dev/null +++ b/src/test/webapp/index.html @@ -0,0 +1,6 @@ + + +

Hello from test app

+

This is a test application for GlassFish Embedded

+ + From b9527bbd1a978c50cc9b6cb8be29a5f3a042a580 Mon Sep 17 00:00:00 2001 From: Ondro Mihalyi Date: Sat, 10 Jan 2026 15:34:22 +0100 Subject: [PATCH 7/9] Test deployment on server --- images/server/7.1.0/docs/content.md | 8 ++++++ .../docker/embedded/EmbeddedDeploymentIT.java | 25 ++----------------- ...StartServIT.java => StartAndDeployIT.java} | 16 ++++++++++-- .../docker/testutils/HttpUtilities.java | 25 ++++++++++++++++--- 4 files changed, 45 insertions(+), 29 deletions(-) rename src/test/java/org/glassfish/main/distributions/docker/server/{StartServIT.java => StartAndDeployIT.java} (70%) diff --git a/images/server/7.1.0/docs/content.md b/images/server/7.1.0/docs/content.md index 57ac3ad..42cc286 100644 --- a/images/server/7.1.0/docs/content.md +++ b/images/server/7.1.0/docs/content.md @@ -55,6 +55,14 @@ Follow these steps: 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 /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 diff --git a/src/test/java/org/glassfish/main/distributions/docker/embedded/EmbeddedDeploymentIT.java b/src/test/java/org/glassfish/main/distributions/docker/embedded/EmbeddedDeploymentIT.java index 45b7940..8a08525 100644 --- a/src/test/java/org/glassfish/main/distributions/docker/embedded/EmbeddedDeploymentIT.java +++ b/src/test/java/org/glassfish/main/distributions/docker/embedded/EmbeddedDeploymentIT.java @@ -26,7 +26,7 @@ import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; -import static org.glassfish.main.distributions.docker.testutils.HttpUtilities.getEmbeddedApplication; +import static org.glassfish.main.distributions.docker.testutils.HttpUtilities.getApplication; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -43,29 +43,8 @@ public class EmbeddedDeploymentIT { @Test void deployedApplicationIsAccessible() throws Exception { - // Wait for the GLASSFISH STARTED message in logs - long startTime = System.currentTimeMillis(); - boolean glassfishStarted = false; - while (!glassfishStarted && (System.currentTimeMillis() - startTime) < 120000) { // 2 minutes - String logs = server.getLogs(); - if (logs.contains("GLASSFISH STARTED")) { - glassfishStarted = true; - } else { - Thread.sleep(1000); // Wait 1 second before checking again - } - } - - if (!glassfishStarted) { - System.err.println("Full logs: " + server.getLogs()); - throw new RuntimeException("GlassFish did not start within 2 minutes"); - } - - System.err.println("GlassFish started successfully, checking application deployment..."); - // Verify the application is deployed by checking if it's accessible - final HttpResponse appResponse = getEmbeddedApplication(server, "/index.html"); - System.err.println("Response status: " + appResponse.statusCode()); - System.err.println("Response body: " + appResponse.body()); + final HttpResponse appResponse = getApplication(server, "/index.html"); assertEquals(200, appResponse.statusCode(), "Application response status code"); assertTrue(appResponse.body().contains("Hello from test app"), "Application should return Hello message"); } diff --git a/src/test/java/org/glassfish/main/distributions/docker/server/StartServIT.java b/src/test/java/org/glassfish/main/distributions/docker/server/StartAndDeployIT.java similarity index 70% rename from src/test/java/org/glassfish/main/distributions/docker/server/StartServIT.java rename to src/test/java/org/glassfish/main/distributions/docker/server/StartAndDeployIT.java index 17c9538..babc1f1 100644 --- a/src/test/java/org/glassfish/main/distributions/docker/server/StartServIT.java +++ b/src/test/java/org/glassfish/main/distributions/docker/server/StartAndDeployIT.java @@ -19,22 +19,27 @@ import java.net.http.HttpResponse; import org.junit.jupiter.api.Test; +import org.testcontainers.containers.BindMode; import org.testcontainers.containers.GenericContainer; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; import static org.glassfish.main.distributions.docker.testutils.HttpUtilities.getServerDefaultRoot; +import static org.glassfish.main.distributions.docker.testutils.HttpUtilities.getApplication; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.stringContainsInOrder; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; @Testcontainers -public class StartServIT { +public class StartAndDeployIT { @SuppressWarnings({"rawtypes", "resource"}) @Container private final GenericContainer server = new GenericContainer<>(System.getProperty("server.docker.glassfish.image")) - .withCommand("startserv").withExposedPorts(8080) + .withCommand("startserv") + .withExposedPorts(8080) + .withFileSystemBind("target/test-classes/application-test.war", "/deploy/application-test.war", BindMode.READ_ONLY) .withLogConsumer(o -> System.err.print("GF: " + o.getUtf8String())); @Test @@ -43,4 +48,11 @@ void rootResourceGivesOkWithDefaultResponse() throws Exception { assertEquals(200, defaultRootResponse.statusCode(), "Response status code"); assertThat(defaultRootResponse.body(), stringContainsInOrder("Eclipse GlassFish", "index.html", "production-quality")); } + + @Test + void deployedApplicationIsAccessible() throws Exception { + final HttpResponse appResponse = getApplication(server, "/application-test/index.html"); + assertEquals(200, appResponse.statusCode(), "Application response status code"); + assertTrue(appResponse.body().contains("Hello from test app"), "Application should return Hello message"); + } } diff --git a/src/test/java/org/glassfish/main/distributions/docker/testutils/HttpUtilities.java b/src/test/java/org/glassfish/main/distributions/docker/testutils/HttpUtilities.java index 5d143da..c514881 100644 --- a/src/test/java/org/glassfish/main/distributions/docker/testutils/HttpUtilities.java +++ b/src/test/java/org/glassfish/main/distributions/docker/testutils/HttpUtilities.java @@ -23,6 +23,7 @@ import java.security.KeyManagementException; import java.security.NoSuchAlgorithmException; import java.security.SecureRandom; +import java.time.Duration; import java.util.Base64; import javax.net.ssl.SSLContext; @@ -33,6 +34,7 @@ import org.testcontainers.containers.GenericContainer; import static java.net.http.HttpResponse.BodyHandlers.ofString; +import static java.time.Duration.ofSeconds; /** * @@ -59,12 +61,27 @@ public static HttpResponse getEmbeddedDefaultRoot(GenericContainer serve } } - public static HttpResponse getEmbeddedApplication(GenericContainer server, String appPath) throws Exception { + public static HttpResponse getApplication(GenericContainer server, String appPath) throws Exception { URI uri = URI.create("http://localhost:" + server.getMappedPort(8080) + appPath); - try (HttpClient client = newInsecureHttpClient()) { - final HttpRequest request = HttpRequest.newBuilder(uri).build(); - return client.send(request, ofString(StandardCharsets.UTF_8)); + + // Wait up to 30 seconds for the application to become available + long startTime = System.currentTimeMillis(); + HttpResponse response = null; + + while ((System.currentTimeMillis() - startTime) < Duration.ofSeconds(30).toMillis()) { + try (HttpClient client = newInsecureHttpClient()) { + final HttpRequest request = HttpRequest.newBuilder(uri).build(); + response = client.send(request, ofString(StandardCharsets.UTF_8)); + + if (response.statusCode() == 200) { + return response; + } + + Thread.sleep(ofSeconds(1)); // Wait 1 second before retrying + } } + + return response; // Return the last response (likely 404) } public static HttpResponse getAdminResource(GenericContainer server, String resourcePath, UserPassword userPass) throws Exception { From e2237ed863363ae8b07d285bd8ed660ecbc2a5ca Mon Sep 17 00:00:00 2001 From: Ondro Mihalyi Date: Sat, 10 Jan 2026 16:06:47 +0100 Subject: [PATCH 8/9] Fix for setting passwords via env var --- images/server/7.1.0/docker-entrypoint.sh | 5 ++++- src/main/resources/images/server/docker-entrypoint.sh | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/images/server/7.1.0/docker-entrypoint.sh b/images/server/7.1.0/docker-entrypoint.sh index 7d15a85..5ebd801 100755 --- a/images/server/7.1.0/docker-entrypoint.sh +++ b/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} diff --git a/src/main/resources/images/server/docker-entrypoint.sh b/src/main/resources/images/server/docker-entrypoint.sh index 7d15a85..9ccdc5e 100755 --- a/src/main/resources/images/server/docker-entrypoint.sh +++ b/src/main/resources/images/server/docker-entrypoint.sh @@ -19,7 +19,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} From 42d161518c5293aa0e8a20d7d11c9dcadf3f11d5 Mon Sep 17 00:00:00 2001 From: Ondro Mihalyi Date: Mon, 19 Jan 2026 22:32:58 +0100 Subject: [PATCH 9/9] Docker entrypoint fixes --- images/server/7.1.0/docker-entrypoint.sh | 25 ++++++++++--------- .../images/server/docker-entrypoint.sh | 24 ++++++++++-------- 2 files changed, 26 insertions(+), 23 deletions(-) diff --git a/images/server/7.1.0/docker-entrypoint.sh b/images/server/7.1.0/docker-entrypoint.sh index 5ebd801..3ef508d 100755 --- a/images/server/7.1.0/docker-entrypoint.sh +++ b/images/server/7.1.0/docker-entrypoint.sh @@ -1,31 +1,28 @@ #!/bin/bash -set -e; +set -e change_passwords () { local PWD_FILE=/tmp/passwordfile local COMMAND= rm -rf $PWD_FILE - if [ x"${AS_ADMIN_PASSWORD}" != x ]; then + if [ "${AS_ADMIN_PASSWORD}" != "" ] && [ "${AS_ADMIN_PASSWORD}" != "admin" ]; 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}" + COMMAND="change-admin-password" echo "AS_ADMIN_PASSWORD=${AS_ADMIN_PASSWORD}" > "${AS_PASSWORD_FILE}" fi - if [ x"${AS_ADMIN_MASTERPASSWORD}" != x ]; then + if [ "${AS_ADMIN_MASTERPASSWORD}" != "" ] && [ "${AS_ADMIN_MASTERPASSWORD}" != "changeit" ]; then echo -e "AS_ADMIN_MASTERPASSWORD=changeit\nAS_ADMIN_NEWMASTERPASSWORD=${AS_ADMIN_MASTERPASSWORD}" >> ${PWD_FILE} - COMMAND="${COMMAND} -change-master-password --passwordfile=${PWD_FILE} --savemasterpassword=true" + COMMAND="${COMMAND}\nchange-master-password --savemasterpassword=true" fi - if [ x"${COMMAND}" != x ]; then - printf "${COMMAND}" > /tmp/commands - asadmin multimode --interactive=false --file /tmp/commands - rm -rf /tmp/commands + if [ "${COMMAND}" != "" ]; then + echo -e "${COMMAND}" | asadmin --interactive=false --passwordfile=${PWD_FILE} fi rm -rf ${PWD_FILE} + history -c } change_passwords @@ -50,6 +47,10 @@ then rm -rf glassfish/domains/domain1/autodeploy/.autodeploystatus || true fi +if [ "${AS_TRACE}" == true ]; then + env|sort +fi + if [ "$1" == 'startserv' ]; then exec "$@" fi @@ -63,4 +64,4 @@ on_exit () { } trap on_exit EXIT -env|sort && "$@" & wait +"$@" & wait diff --git a/src/main/resources/images/server/docker-entrypoint.sh b/src/main/resources/images/server/docker-entrypoint.sh index 9ccdc5e..3ef508d 100755 --- a/src/main/resources/images/server/docker-entrypoint.sh +++ b/src/main/resources/images/server/docker-entrypoint.sh @@ -1,30 +1,28 @@ #!/bin/bash -set -e; +set -e change_passwords () { local PWD_FILE=/tmp/passwordfile local COMMAND= rm -rf $PWD_FILE - if [ x"${AS_ADMIN_PASSWORD}" != x ]; then + if [ "${AS_ADMIN_PASSWORD}" != "" ] && [ "${AS_ADMIN_PASSWORD}" != "admin" ]; then echo -e "AS_ADMIN_PASSWORD=admin\nAS_ADMIN_NEWPASSWORD=${AS_ADMIN_PASSWORD}" >> $PWD_FILE - COMMAND="change-admin-password --passwordfile=${PWD_FILE}" + COMMAND="change-admin-password" echo "AS_ADMIN_PASSWORD=${AS_ADMIN_PASSWORD}" > "${AS_PASSWORD_FILE}" fi - if [ x"${AS_ADMIN_MASTERPASSWORD}" != x ]; then + if [ "${AS_ADMIN_MASTERPASSWORD}" != "" ] && [ "${AS_ADMIN_MASTERPASSWORD}" != "changeit" ]; then echo -e "AS_ADMIN_MASTERPASSWORD=changeit\nAS_ADMIN_NEWMASTERPASSWORD=${AS_ADMIN_MASTERPASSWORD}" >> ${PWD_FILE} - COMMAND="${COMMAND} -change-master-password --passwordfile=${PWD_FILE} --savemasterpassword=true" + COMMAND="${COMMAND}\nchange-master-password --savemasterpassword=true" fi - if [ x"${COMMAND}" != x ]; then - printf "${COMMAND}" > /tmp/commands - asadmin multimode --interactive=false --file /tmp/commands - rm -rf /tmp/commands + if [ "${COMMAND}" != "" ]; then + echo -e "${COMMAND}" | asadmin --interactive=false --passwordfile=${PWD_FILE} fi rm -rf ${PWD_FILE} + history -c } change_passwords @@ -49,6 +47,10 @@ then rm -rf glassfish/domains/domain1/autodeploy/.autodeploystatus || true fi +if [ "${AS_TRACE}" == true ]; then + env|sort +fi + if [ "$1" == 'startserv' ]; then exec "$@" fi @@ -62,4 +64,4 @@ on_exit () { } trap on_exit EXIT -env|sort && "$@" & wait +"$@" & wait