SYS-622 alpine:20 wip

instantlinux · Jul 2, 2024 · 1c879e1 · 1c879e1
1 parent 50ded6f
commit 1c879e1
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 9 deletions.
diff --git a/images/data-sync/Dockerfile b/images/data-sync/Dockerfile
@@ -34,8 +34,6 @@ RUN apk add --update openssh-client openssh-server perl rsync && \
       https://github.com/bcpierce00/unison/archive/v$UNISON_VERSION.tar.gz && \
     echo "$UNISON_SHA  unison.tar.gz" | sha256sum -c && \
     tar zxf unison.tar.gz --strip-components=1 && \
-    sed -i -e 's/GLIBC_SUPPORT_INOTIFY 0/GLIBC_SUPPORT_INOTIFY 1/' \
-      src/fsmonitor/linux/inotify_stubs.c && \
     make && cp src/unison src/unison-fsmonitor /usr/bin && \
     cd .. && apk del .fetch-deps && \
     rm -fr /build /var/log/* /var/cache/apk/* && \

diff --git a/images/git-pull/Dockerfile b/images/git-pull/Dockerfile
@@ -8,7 +8,7 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
     org.label-schema.vcs-ref=$VCS_REF \
     org.label-schema.vcs-url=https://github.com/instantlinux/docker-tools
 
-ARG GIT_VERSION=2.52.2-r0
+ARG GIT_VERSION=2.45.2-r0
 ENV DEST=. \
     GIT_COMMIT=master \
     GIT_HOST=github.com \

diff --git a/images/mt-daapd/Dockerfile b/images/mt-daapd/Dockerfile
@@ -1,3 +1,7 @@
+# TODO: this dockerfile is obsoleted by the code maintainer and will
+# require install-from-source because debian repo no longer includes
+# either forked-daapd or owntone.
+#  https://owntone.github.io/owntone-server/installation/
 FROM debian:buster-slim
 MAINTAINER Rich Braun <[email protected]>
 ARG BUILD_DATE

diff --git a/images/mythtv-backend/helm/Chart.yaml b/images/mythtv-backend/helm/Chart.yaml
@@ -6,8 +6,8 @@ sources:
 - https://github.com/instantlinux/docker-tools
 - https://github.com/mythtv/mythtv
 type: application
-version: 0.1.9
-appVersion: "33.1-fixes.202309262218.26e76a3949"
+version: 0.1.10
+appVersion: "33.1-fixes.202405301110.512d723c83"
 dependencies:
 - name: chartlib
   version: 0.1.8

diff --git a/images/nagios/Dockerfile b/images/nagios/Dockerfile
@@ -25,7 +25,7 @@ ENV AUTHORIZED_USERS=nagiosadmin \
     PERF_ENABLE=yes \
     TZ=UTC
 
-RUN deluser xfs && addgroup -g $NAGIOS_GID nagios && \
+RUN addgroup -g $NAGIOS_GID nagios && \
     adduser -g www-data -u $WWW_UID -DSH -h /var/www www-data && \
     adduser -G nagios -g "Nagios Server" -DSH -h /var/nagios -u $NAGIOS_UID \
       nagios && \
@@ -36,7 +36,7 @@ RUN deluser xfs && addgroup -g $NAGIOS_GID nagios && \
       nagios-plugins-mysql=$PLUGINS_VERSION \
       nrpe-plugin bash curl fcgiwrap file mariadb-client nginx openssl \
       perl-crypt-x509 perl-libwww perl-text-glob perl-timedate \
-      php81 php81-fpm py3-pip py3-pymysql python3 ssmtp tzdata && \
+      php82 php82-fpm py3-pip py3-pymysql python3 ssmtp tzdata && \
     addgroup nginx nagios && \
     chmod u+s /usr/lib/nagios/plugins/check_ping && \
     sed -i -e s/use_syslog=.*/use_syslog=0/ \
@@ -51,6 +51,6 @@ EXPOSE 80
 VOLUME /etc/nagios /opt/nagios/plugins /var/nagios
 
 COPY nginx.conf /etc/nginx/http.d/nagios.conf
-COPY php-fpm-www.conf /etc/php81/php-fpm.d/www.conf
+COPY php-fpm-www.conf /etc/php82/php-fpm.d/www.conf
 COPY entrypoint.sh mail.sh /usr/local/bin/
 ENTRYPOINT /usr/local/bin/entrypoint.sh
diff --git a/images/nagios/entrypoint.sh b/images/nagios/entrypoint.sh
@@ -94,7 +94,7 @@ for item in backup hosts services; do
 done
 start-stop-daemon -u nginx -b --exec /usr/bin/fcgiwrap -- \
   -s unix:/run/fcgiwrap/fcgiwrap.sock
-/usr/sbin/php-fpm81
+/usr/sbin/php-fpm82
 /usr/sbin/nginx
 touch /var/nagios/nagios.log && tail -1 -f /var/nagios/nagios.log &
 find /var/nagios -not -user nagios -exec chown nagios.nagios {} \;