Merge remote-tracking branch 'origin/main'

Author: mihxil

README.adoc

@@ -1,8 +1,7 @@
 // DO NOT EDIT THIS FILE IT IS GENERATED!!
 = MMBase Docker Images
 :toc:
-
-
+:tag: latest-jdk25
 
 I created a few docker images to ease running and building MMBase in these new ages. Basically they are java 8, which is already a bit more modern then the latest releases back then. It shouldn't be a big issue to run on more recent jvm's so experimentally also java 25 images are built.
 
@@ -25,44 +24,36 @@ and `major java version` is either `8` or `25` currently.
 :leveloffset: +1
 
 
-= mmbase/env:latest
+= mmbase/env:{tag}
 
 This is the base image which contains minimal tools to run MMBase.
 I.e. it is a debian image with java (8 or 25) and image magick.
 
 To run the streams application 'ffmpeg' is needed, which be installed additionally.
 
-Also a proper prompt and other convenience tools are installed.
+Also, a proper prompt and other convenience tools are installed.
 
 
 
-= mmbase/tomcat:latest
+= mmbase/tomcat:{tag}
 
 This image is based on `mmbase/env` and sets up also a tomcat. Without any application though. It basically serves as a base image for other images containing actual applications
 
 E.g.
 
-[source, Dockerfile]
+[source, Dockerfile, subs="attributes"]
 ----
-from ghcr.io/mmbase/tomcat:latest
+FROM  ghcr.io/mmbase/tomcat:{tag}
 
+ARG MARIA_DB_VERSION=3.5.7
 
-COPY target/oip-1.2-SNAPSHOT.war /tmp
-----
+RUN  curl --fail -L https://repo1.maven.org/maven2/org/mariadb/jdbc/mariadb-java-client/${MARIA_DB_VERSION}/mariadb-java-client-${MARIA_DB_VERSION}.jar -o ${CATALINA_BASE}/lib/mariadb-java-client-${MARIA_DB_VERSION}.jar
 
-= mmbase/example-webapp:latest
+# ON BUILD, the war in target/*.war will be used
 
-This e.g. is then based on `mmbase/tomcat` but also installs the 'example-webapp' (currently `1.9-SNAPSHOT`)
-
-You may run it like so:
-[source, base]
-----
-docker run --name mmbase-example-webapp -p 8080:8080 mmbase/example-webapp:latest
 ----
 
-This will start the 'example' application on 8080. It is running on a non-persistent hsql database then.
-
-= mmbase/build:latest
+= mmbase/build:{tag}
 
 This is currently used to https://github.com/mmbase/mmbase/actions[build MMBase].
 
@@ -73,14 +64,31 @@ It contains the tools necessary for that. I.e. the build tools itself, but some
 
 == Example
 
-[source, bash]
+[source, bash, subs=attributes]
 ----
 michiel@L824:(MMBase-1_9)~/github/mmbase/mmbase$ git remote -v
 origin  [email protected]:mmbase/mmbase.git (fetch)
 origin  [email protected]:mmbase/mmbase.git (push)
-michiel@L824:(MMBase-1_9)~/github/mmbase/mmbase$  docker run -it -v $HOME/.m2:/root/.m2 -v $(pwd):/work mmbase/build:latest
+michiel@L824:(MMBase-1_9)~/github/mmbase/mmbase$  docker run -it -v $HOME/.m2:/root/.m2 -v $(pwd):/work mmbase/build:{tag}
 root@101c0579daf9:/# cd /work/
 root@101c0579daf9:/work# mvn package
 ----
 
+= mmbase/commandserver:{tag}
+
+This is an extension of `mmbase/env:{tag}` , which has the MMBase command server installed, and also ffmpeg.
+
+= mmbase/example-webapp:latest
+
+This e.g. is then based on `mmbase/tomcat` but also installs the 'example-webapp' (currently `1.9-SNAPSHOT`)
+
+You may run it like so:
+[source, base]
+----
+docker run --name mmbase-example-webapp -p 8080:8080 mmbase/example-webapp:latest
+----
+
+This will start the 'example' application on 8080. It is running on a non-persistent hsql database then.
+
+
 :leveloffset: -1