Merge branch 'master' into latest

Author: sni

.screenrc

@@ -1,15 +1,15 @@
-FROM debian:11
-MAINTAINER Sven Nierlein<sven.nierlein@consol.de>
+FROM debian:12
+LABEL org.opencontainers.image.authors="sven.nierlein@consol.de"
+LABEL org.opencontainers.image.source="https://github.com/ConSol-Monitoring/omd-labs-docker"
 EXPOSE 80 443 22 4730 5666
 
-ENV REFRESHED 20221129
+ENV REFRESHED=20240816
 
 #### user environment ######################################
 ENV HOME=/root
 WORKDIR $HOME
 ADD ./scripts/start.sh $HOME
 RUN chmod +x $HOME/start.sh
-ADD .screenrc $HOME
 
 ### OMD installation ######################################
 ARG OMD_VERSION
@@ -39,7 +39,7 @@ ARG SITENAME=demo
 ENV SITENAME=$SITENAME
 RUN echo "export SITENAME=$SITENAME" > .sitename.env
 RUN sed -i 's|echo "on"$|echo "off"|' /opt/omd/versions/default/lib/omd/hooks/TMPFS
-RUN echo "create OMD site: $SITENAME" && omd create -u 1000 -g 1000 $SITENAME || true
+RUN echo "create OMD site: $SITENAME" && omd create -u 1000 -g 1000 $SITENAME
 
 # -- ONBUILD
 # when used as a base image, this instructions trigger the creation of another site if NEW_SITENAME is not `demo`

Dockerfile.omd-labs-debian

@@ -1,15 +1,15 @@
 FROM rockylinux:9
-MAINTAINER Sven Nierlein<sven.nierlein@consol.de>
+LABEL org.opencontainers.image.authors="sven.nierlein@consol.de"
+LABEL org.opencontainers.image.source="https://github.com/ConSol-Monitoring/omd-labs-docker"
 EXPOSE 80 443 22 4730 5666
 
-ENV REFRESHED 20221129
+ENV REFRESHED=20240809
 
 #### user environment ######################################
 ENV HOME=/root
 WORKDIR $HOME
 ADD ./scripts/start.sh $HOME
 RUN chmod +x $HOME/start.sh
-ADD .screenrc $HOME
 
 ### OMD installation ######################################
 ARG OMD_VERSION
@@ -39,7 +39,7 @@ ARG SITENAME=demo
 ENV SITENAME=$SITENAME
 RUN echo "export SITENAME=$SITENAME" > .sitename.env
 RUN sed -i 's|echo "on"$|echo "off"|' /opt/omd/versions/default/lib/omd/hooks/TMPFS
-RUN echo "create OMD site: $SITENAME" && omd create -u 1000 -g 1000 $SITENAME || true
+RUN echo "create OMD site: $SITENAME" && omd create -u 1000 -g 1000 $SITENAME
 
 # -- ONBUILD
 # when used as a base image, this instructions trigger the creation of another site if NEW_SITENAME is not `demo`

Dockerfile.omd-labs-rocky

@@ -1,11 +1,14 @@
 # omd-labs-docker
 
-OMD "Labs" Edition (https://labs.consol.de/de/omd/) on Docker with Ansible support.
+OMD "Labs" Edition (https://omd.consol.de/docs/omd/) on Docker with Ansible support.
 
 Author: Sven Nierlein, *sven.nierlein at consol.de*
 
 Original Author: Simon Meggle
 
+- https://omd.consol.de/docs/omd/
+- https://github.com/ConSol-Monitoring/omd-labs-docker
+
 ## Automated builds, branches & tags
 
 Each image build gets triggered by the OMD Labs build system as soon as there are new packages of OMD available:

README.md

@@ -6,16 +6,3 @@
   - name: "DEBUG"
     debug:
       msg: "Nothing defined yet. Use this playbook to adapt the container/OMD site {{ SITENAME }} at runtime."
-
-# - name: configure Sakuli extension
-#   become: yes
-#   become_user: "{{ SITENAME }}"
-#   become_method: "su"
-#   become_flags: "-"
-#   command: make "{{ item }}"
-#   with_items:
-#     - "gearman"
-#     - "grafana"
-#     - "screenshot_history"
-#   args:
-#     chdir: "$OMD_ROOT/share/sakuli/setup"