SYS-666 fixes - mariadb-galera, nagiosql

Author: instantlinux

images/mariadb-galera/README.md

@@ -41,7 +41,6 @@ troubleshooting, if you're running a recent version of Docker you can override
 its ingress load-balancer thus:
 
 ~~~
-    version: "3.2"
     services:
       db:
         ...
@@ -149,4 +148,4 @@ Thanks to ashraf-s9s of severalnines for the healthcheck script.
 
 If you want to make improvements to this image, see [CONTRIBUTING](https://github.com/instantlinux/docker-tools/blob/main/CONTRIBUTING.md).
 
-[![](https://img.shields.io/badge/license-GPL--2.0-red.svg)](https://choosealicense.com/licenses/gpl-2.0/ "License badge") [![](https://img.shields.io/badge/code-mariadb%2Fserver-blue)](https://github.com/MariaDB/server "Code repo")
+[![](https://img.shields.io/badge/license-GPL--2.0-red.svg)](https://choosealicense.com/licenses/gpl-2.0/ "License badge") [![](https://img.shields.io/badge/code-mariadb%2Fserver-blue)](https://github.com/MariaDB/server "Code repo")

images/nagiosql/Dockerfile

@@ -30,13 +30,13 @@ COPY html /var/www/html
 RUN addgroup -g $NAGIOS_GID nagios && \
     adduser -u $APACHE_UID -g Apache -DSH -h /var/www apache && \
     adduser -u $NAGIOS_UID -g "Nagios Server" -DSH -h /var/nagios nagios && \
-    apk add --update --no-cache apache2 curl nagios=$NAGIOS_VERSION php82 \
-      php82-apache2 php82-ftp php82-gettext php82-mysqli php82-pear php82-session \
-      php82-pecl-ssh2 tzdata && \
+    apk add --update --no-cache apache2 curl nagios=$NAGIOS_VERSION php83 \
+      php83-apache2 php83-ftp php83-gettext php83-mysqli php83-pear php83-session \
+      php83-pecl-ssh2 tzdata && \
     addgroup apache nagios && \
-    echo 'date.timezone = UTC' > /etc/php82/conf.d/50-tz.ini && \
+    echo 'date.timezone = UTC' > /etc/php83/conf.d/50-tz.ini && \
     echo 'include_path = ".:/var/www/nagiosql/libraries/pear"' \
-      > /etc/php82/conf.d/50-include.ini && \
+      > /etc/php83/conf.d/50-include.ini && \
     cd /tmp && \
     curl -sLo $NAGIOSQL_DOWNLOAD \
       https://sourceforge.net/projects/nagiosql/files/nagiosql/NagiosQL%20${NAGIOSQL_VERSION}/${NAGIOSQL_DOWNLOAD} && \

images/nagiosql/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3.1"
-
 services:
   app:
     image: instantlinux/nagios:${VERSION_NAGIOS:-latest}

lib/build/Makefile.docker_image

@@ -19,6 +19,9 @@ endif
 ifeq ($(IMAGE),data-sync)
   PLATFORMS = linux/amd64,linux/aarch64
 endif
+ifeq ($(IMAGE),mariadb-galera)
+  PLATFORMS = linux/amd64
+endif
 ifeq ($(IMAGE),mythtv-backend)
   PLATFORMS = linux/amd64
 endif

services/haproxy-keepalived/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3.1"
-
 services:
 
   app:

services/keycloak/docker-compose.yml

@@ -1,4 +1,3 @@
-version: '3'
 services:
   db:
     image: mariadb:10

services/mythtv-backend/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3.1"
-
 services:
   app:
     image: ${REGISTRY_URI:-instantlinux}/mythtv-backend:${VERSION_MYTHTV}

services/nut-upsd/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3.1"
-
 services:
   app:
     image: ${REGISTRY_URI:-instantlinux}/nut-upsd:latest

services/restic-server/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3.1"
-
 services:
   app:
     image: restic/rest-server:${VERSION_RESTIC:-latest}