adjusted README and docker files to use eclipse-tamurin:8-jdk as base JDK

README.md

@@ -92,7 +92,7 @@ Connect to your server at ``http://localhost:8888`` and find its administration
 
 ## Docker
 
-To build a docker image, try ``docker/makeImageForLatestRelease``. The upload to the default (private) Dockerhub repository will usually fail unless you are a collaborator for that repository, but you should see a local image tagged ``docker.sapsailing.com/sapsailing:...`` result from the build. To run that docker image, try something like
+To build a docker image, try ``docker/makeImageForLatestRelease``. The upload to the default Github Package Registry (``ghcr.io``) will usually fail unless you are a collaborator for that repository, but you should see a local image tagged ``ghcr.io/sap/sailing-analytics:...`` resulting from the build. To run that docker image, try something like
 ```
     docker run -d -e "MEMORY=4g" -e "MONGODB_URI=mongodb://my.mongohost.org?replicaSet=rs0&retryWrites=true" -P <yourimage>
 ```
@@ -109,9 +109,24 @@ In this example, find your web application at http://localhost:32779 which is wh
 ```
 to connect to the server's OSGi console.
 
+The default Docker image built by ``docker/makeImageForLatestRelease`` uses the ``eclipse-temurin:8-jdk`` base image. If you'd like to use the SAP JVM 8 which gives you great profiling and reversible on-the-fly debugging capabilities, you may build a Docker image for it, using ``docker/Dockerfile_sapjvm``. Using it to build an image will accept version 3.2 of the SAP tools developer license on your behalf. Build the image, e.g., like this:
+
+```
+    cd ${GITROOT}/docker
+    docker build --build-arg SAPJVM_VERSION=8.1.099 -t sapjvm8:8.1.099 -f Dockerfile_sapjvm .
+```
+
+Then patch or copy ``docker/Dockerfile`` so that it has
+
+```
+   FROM sapjvm8:8.1.099
+```
+
+(of course with the version tag adjusted to what you used above when you built/tagged the image). This will give you an SAP JVM 8 under ``/opt/sapjvm_8`` in the container which in particular includes the useful ``jvmmon`` utility specific to the SAP JVM 8.
+
 ## Docker Compose
 
-If you have built or obtained the ``docker.sapsailing.com/sapsailing:latest`` image, try this:
+If you have built or obtained the ``ghcr.io/sap/sailing-analytics:latest`` image, try this:
 ```
     cd docker
     docker-compose up
@@ -123,6 +138,13 @@ Based on the ``docker/docker-compose.yml`` definition you should end up with thr
 
 Try a request to [``http://127.0.0.1:8888/index.html``](http://127.0.0.1:8888/index.html) or [``http://127.0.0.1:8888/gwt/status``](http://127.0.0.1:8888/gwt/status) to see if things worked.
 
+To use Java 17, use the ``docker-compose-17.yml`` file instead:
+
+```
+    cd docker
+    docker-compose -f docker-compose-17.yml up
+```
+
 ## Configuration Options, Environment Variables
 
 The server process can be configured in various ways. The corresponding environment variables you may use during installation with ``refreshInstance.sh`` and for setting up your Docker environment can be found in the following files:

docker/Dockerfile

@@ -1,6 +1,6 @@
 FROM eclipse-temurin:8-jdk
 # To build with an SAP JVM 8 base image built using Dockerfile_sapjvm, use something like:
-#FROM docker.sapsailing.com/sapjvm8:8.1.098
+#FROM sapjvm8:8.1.098
 ARG RELEASE
 LABEL maintainer=axel.uhl@sap.com
 # Download and extract the release

docker/docker-compose-17.yml

@@ -1,7 +1,7 @@
 version: "3.10"
 services:
   sailing-analytics:
-    image: "docker.sapsailing.com/sapsailing_on_sapmachine17:latest"
+      image: "ghcr.io/sap/sailing-analytics:latest-17"
     ports:
       - "8888:8888"
       - "6666:6666"

docker/docker-compose.yml

@@ -1,7 +1,7 @@
 version: "3.10"
 services:
   sailing-analytics:
-    image: "docker.sapsailing.com/sapsailing:latest"
+    image: "ghcr.io/sap/sailing-analytics:latest"
     ports:
       - "8888:8888"
       - "6666:6666"

docker/makeImageForLatestRelease

@@ -13,12 +13,11 @@ cp "$GITROOT/java/target/env.sh" "$DOCKERDIR"
 cp "$GITROOT/java/target/start" "$DOCKERDIR"
 cp "$GITROOT/java/target/configuration/JavaSE-11.profile" "$DOCKERDIR"
 cd "$DOCKERDIR"
-docker build --build-arg RELEASE=${release} -t sapsailing:${release} .
+docker build --build-arg RELEASE=${release} -t ghcr.io/sap/sailing-analytics:${release} .
 echo "Cleaning up..."
 rm start env.sh JavaSE-11.profile
-docker tag sapsailing:${release} docker.sapsailing.com/sapsailing:${release}
-docker push docker.sapsailing.com/sapsailing:${release}
+docker push ghcr.io/sap/sailing-analytics:${release}
 if [ "$SET_LATEST" = "1" ]; then
-  docker tag sapsailing:${release} docker.sapsailing.com/sapsailing:latest
-  docker push docker.sapsailing.com/sapsailing:latest
+  docker tag ghcr.io/sap/sailing-analytics:${release} ghcr.io/sap/sailing-analytics:latest
+  docker push ghcr.io/sap/sailing-analytics:latest
 fi

docker/makeImageForLatestRelease-on-sapmachine11

@@ -14,14 +14,13 @@ for f in ${FILES_TO_COPY_FROM_JAVA_TARGET}; do
   cp "${GITROOT}/java/target/${f}" "$DOCKERDIR"
 done
 cd "$DOCKERDIR"
-docker build --build-arg RELEASE=${release} -t sapsailing_on_sapmachine11:${release} -f Dockerfile_sapsailing_on_sapmachine11 .
+docker build --build-arg RELEASE=${release} -t ghcr.io/sap/sailing-analytics:${release} -f Dockerfile_sapsailing_on_sapmachine11 .
 echo "Cleaning up..."
 for f in ${FILES_TO_COPY_FROM_JAVA_TARGET}; do
   rm "`basename ${f}`"
 done
-docker tag sapsailing_on_sapmachine11:${release} docker.sapsailing.com/sapsailing_on_sapmachine11:${release}
-docker push docker.sapsailing.com/sapsailing_on_sapmachine11:${release}
+docker push ghcr.io/sap/sailing-analytics:${release}
 if [ "$SET_LATEST" = "1" ]; then
-  docker tag sapsailing_on_sapmachine11:${release} docker.sapsailing.com/sapsailing_on_sapmachine11:latest
-  docker push docker.sapsailing.com/sapsailing_on_sapmachine11:latest
+  docker tag ghcr.io/sap/sailing-analytics:${release} ghcr.io/sap/sailing-analytics:latest-11
+  docker push ghcr.io/sap/sailing-analytics:latest-11
 fi

docker/makeImageForLatestRelease-on-sapmachine17

@@ -14,14 +14,13 @@ for f in ${FILES_TO_COPY_FROM_JAVA_TARGET}; do
   cp "${GITROOT}/java/target/${f}" "$DOCKERDIR"
 done
 cd "$DOCKERDIR"
-docker build --build-arg RELEASE=${release} -t sapsailing_on_sapmachine17:${release} -f Dockerfile_sapsailing_on_sapmachine17 .
+docker build --build-arg RELEASE=${release} -t ghcr.io/sap/sailing-analytics:${release} -f Dockerfile_sapsailing_on_sapmachine17 .
 echo "Cleaning up..."
 for f in ${FILES_TO_COPY_FROM_JAVA_TARGET}; do
   rm "`basename ${f}`"
 done
-docker tag sapsailing_on_sapmachine17:${release} docker.sapsailing.com/sapsailing_on_sapmachine17:${release}
-docker push docker.sapsailing.com/sapsailing_on_sapmachine17:${release}
+docker push ghcr.io/sap/sailing-analytics:${release}
 if [ "$SET_LATEST" = "1" ]; then
-  docker tag sapsailing_on_sapmachine17:${release} docker.sapsailing.com/sapsailing_on_sapmachine17:latest
-  docker push docker.sapsailing.com/sapsailing_on_sapmachine17:latest
+  docker tag ghcr.io/sap/sailing-analytics:${release} ghcr.io/sap/sailing-analytics:latest-17
+  docker push ghcr.io/sap/sailing-analytics:latest-17
 fi