-
Notifications
You must be signed in to change notification settings - Fork 90
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
SYS-622 alpine:20 image updates (#160)
* SYS-622 alpine:20 image updates
- Loading branch information
1 parent
8868eff
commit c5789d4
Showing
35 changed files
with
83 additions
and
74 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
FROM alpine:3.19 | ||
FROM alpine:3.20 | ||
MAINTAINER Rich Braun "[email protected]" | ||
ARG BUILD_DATE | ||
ARG VCS_REF | ||
|
@@ -16,9 +16,9 @@ ENV PEERNAME= \ | |
SSHKEY1=data-sync-sshkey1 \ | ||
SSHKEY2=data-sync-sshkey2 | ||
|
||
ARG UNISON_VERSION=2.53.3 | ||
ARG OCAML_VERSION=4.14.1-r3 | ||
ARG UNISON_SHA=aaea04fc5bc76dcfe8627683c9659ee4c194d4f992cc8aaa15bbb2820fc8de46 | ||
ARG UNISON_VERSION=2.53.5 | ||
ARG OCAML_VERSION=4.14.2-r1 | ||
ARG UNISON_SHA=330418ad130d93d0e13da7e7e30f9b829bd7c0e859355114bd4644c35fe08d23 | ||
ARG RRSYNC_SHA=b745a37909fc10087cc9c901ad7dfda8ad8b6b493097b156b68ba33db4a5a52f | ||
|
||
COPY src/ /root/src/ | ||
|
@@ -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/* && \ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
FROM alpine:3.19 | ||
FROM alpine:3.20 | ||
MAINTAINER Rich Braun "[email protected]" | ||
ARG BUILD_DATE | ||
ARG VCS_REF | ||
|
@@ -20,7 +20,7 @@ ENV API_TOKEN_SECRET= \ | |
USERNAME=git-dump \ | ||
TZ=UTC | ||
|
||
ARG GIT_VERSION=2.43.4-r0 | ||
ARG GIT_VERSION=2.45.2-r0 | ||
ARG GROUP=care | ||
ARG GID=505 | ||
ARG UID=212 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
FROM alpine:3.19 | ||
FROM alpine:3.20 | ||
MAINTAINER Rich Braun <[email protected]> | ||
ARG BUILD_DATE | ||
ARG VCS_REF | ||
|
@@ -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.43.4-r0 | ||
ARG GIT_VERSION=2.45.2-r0 | ||
ENV DEST=. \ | ||
GIT_COMMIT=master \ | ||
GIT_HOST=github.com \ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
FROM alpine:3.19 | ||
FROM alpine:3.20 | ||
MAINTAINER Rich Braun "[email protected]" | ||
ARG BUILD_DATE | ||
ARG VCS_REF | ||
|
@@ -18,7 +18,7 @@ ENV HOUR=3 MINUTE=30 \ | |
TZ=UTC | ||
ARG UID=210 | ||
ARG BACKUP_GID=34 | ||
ARG CLIENT_VERSION=10.11.6-r0 | ||
ARG CLIENT_VERSION=10.11.8-r0 | ||
|
||
RUN RMGROUP=$(grep :$BACKUP_GID: /etc/group | cut -d: -f 1) && \ | ||
[ -z "$RMGROUP" ] || delgroup $RMGROUP && \ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
FROM alpine:3.19 | ||
FROM alpine:3.20 | ||
MAINTAINER Rich Braun "[email protected]" | ||
ARG BUILD_DATE | ||
ARG VCS_REF | ||
|
@@ -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 NAGIOS_VERSION=4.5.1-r0 | ||
ARG NAGIOS_VERSION=4.5.2-r0 | ||
ARG NAGIOS_GID=1000 | ||
ARG NAGIOS_UID=999 | ||
ARG PLUGINS_VERSION=2.4.5-r1 | ||
|
@@ -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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
FROM alpine:3.19 | ||
FROM alpine:3.20 | ||
MAINTAINER Rich Braun "[email protected]" | ||
ARG BUILD_DATE | ||
ARG VCS_REF | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
FROM alpine:3.19 | ||
FROM alpine:3.20 | ||
MAINTAINER Rich Braun "[email protected]" | ||
ARG BUILD_DATE | ||
ARG VCS_REF | ||
|
@@ -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 OPENLDAP_VERSION=2.6.6-r1 | ||
ARG OPENLDAP_VERSION=2.6.7-r0 | ||
ENV SLAPD_DN_ATTR=uid \ | ||
SLAPD_FQDN=example.com \ | ||
SLAPD_LOG_LEVEL=Config,Stats \ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
ARG POSTFIX_VERSION=3.8.6-r0 | ||
ARG POSTFIX_VERSION=3.9.0-r1 | ||
|
||
FROM instantlinux/postfix:$POSTFIX_VERSION | ||
MAINTAINER Rich Braun "[email protected]" | ||
|
@@ -21,7 +21,7 @@ ENV BLACKLIST_USER_SECRET=mysql-blacklist-user \ | |
SPAMC_HOST=spamassassin | ||
ARG GETPIP_SHA=311afebb7cdd310eb3a3a6bb6fffef53d84493db98c7cebf4008a18d3418c8be | ||
ARG GETPIP_URI=https://bootstrap.pypa.io/pip/3.5/get-pip.py | ||
ARG PYTHON_PIP_VERSION=23.3.2 | ||
ARG PYTHON_PIP_VERSION=24.1.1 | ||
|
||
COPY requirements.txt /root/ | ||
COPY src/ /usr/local/bin/ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
FROM alpine:3.19 | ||
FROM alpine:3.20 | ||
MAINTAINER Rich Braun "[email protected]" | ||
ARG BUILD_DATE | ||
ARG VCS_REF | ||
|
@@ -7,7 +7,7 @@ LABEL org.label-schema.build-date=$BUILD_DATE \ | |
org.label-schema.name=postfix \ | ||
org.label-schema.vcs-ref=$VCS_REF \ | ||
org.label-schema.vcs-url=https://github.com/instantlinux/docker-tools | ||
ARG POSTFIX_VERSION=3.8.6-r0 | ||
ARG POSTFIX_VERSION=3.9.0-r1 | ||
ENV SASL_PASSWD_SECRET=postfix-sasl-passwd \ | ||
TZ=UTC | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
FROM alpine:3.19 | ||
FROM alpine:3.20 | ||
MAINTAINER Rich Braun "[email protected]" | ||
ARG BUILD_DATE | ||
ARG VCS_REF | ||
|
@@ -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 PROFTPD_VERSION=1.3.8b-r1 | ||
ARG PROFTPD_VERSION=1.3.8b-r2 | ||
|
||
ENV ALLOW_OVERWRITE=on \ | ||
ANONYMOUS_DISABLE=off \ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
FROM alpine:3.19 | ||
FROM alpine:3.20 | ||
MAINTAINER Rich Braun "[email protected]" | ||
ARG BUILD_DATE | ||
ARG VCS_REF | ||
|
@@ -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 RSYSLOG_VERSION=8.2310.0-r0 | ||
ARG RSYSLOG_VERSION=8.2404.0-r0 | ||
ENV TZ=UTC | ||
RUN apk add --update gzip logrotate rsyslog=$RSYSLOG_VERSION \ | ||
rsyslog-mysql=$RSYSLOG_VERSION tar xz && \ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
FROM alpine:3.19 | ||
FROM alpine:3.20 | ||
MAINTAINER Rich Braun "[email protected]" | ||
ARG BUILD_DATE | ||
ARG VCS_REF | ||
|
@@ -24,7 +24,7 @@ ENV ADMIN_PASSWORD_SECRET=samba-admin-password \ | |
WINBIND_USE_DEFAULT_DOMAIN=yes \ | ||
WORKGROUP=AD | ||
|
||
ARG SAMBA_VERSION=4.18.9-r0 | ||
ARG SAMBA_VERSION=4.19.6-r0 | ||
|
||
COPY *.conf.j2 /root/ | ||
COPY entrypoint.sh /usr/local/bin/ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.