Skip to content

Commit

Permalink
SYS-607 image updates for Alpine 3.18
Browse files Browse the repository at this point in the history
  • Loading branch information
instantlinux committed Jul 5, 2023
1 parent deb7b41 commit b07eaa2
Show file tree
Hide file tree
Showing 35 changed files with 68 additions and 67 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ The cluster-deployment tools here include helm charts and ansible playbooks to s

Thank you to the following contributors!

* [Mike Neir](https://github.com/d0ct0rvenkman)
* [Chad Hedstrom](https://github.com/Hadlock) - [personal site](http://nearlydeaf.com/)
* [Sean Mollet](https://github.com/SeanMollet)
* [Juan Manuel Carrillo Moreno](https://github.com/inetshell) - [personal site](https://wiki.inetshell.mx/)
Expand Down
6 changes: 3 additions & 3 deletions images/data-sync/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.17
FROM alpine:3.18
MAINTAINER Rich Braun "[email protected]"
ARG BUILD_DATE
ARG VCS_REF
Expand All @@ -16,8 +16,8 @@ ENV PEERNAME= \
SSHKEY1=data-sync-sshkey1 \
SSHKEY2=data-sync-sshkey2

ARG UNISON_VERSION=2.53.0
ARG OCAML_VERSION=4.14.0-r0
ARG UNISON_VERSION=2.53.3
ARG OCAML_VERSION=4.14.1-r1
ARG UNISON_SHA=9364477df4501b9c7377e2ca1a7c4b44c1f16fa7cbc12b7f5b543d08c3f0740a
ARG RRSYNC_SHA=b745a37909fc10087cc9c901ad7dfda8ad8b6b493097b156b68ba33db4a5a52f

Expand Down
4 changes: 2 additions & 2 deletions images/data-sync/helm/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ home: https://github.com/instantlinux/docker-tools
sources:
- https://github.com/instantlinux/docker-tools
type: application
version: 0.1.8
appVersion: "2.53.0-4.14.0-r0"
version: 0.1.9
appVersion: "2.53.3-4.14.1-r1"
dependencies:
- name: chartlib
version: 0.1.8
Expand Down
6 changes: 3 additions & 3 deletions images/dhcpd-dns-pxe/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.17
FROM alpine:3.18
MAINTAINER Rich Braun "[email protected]"
ARG BUILD_DATE
ARG VCS_REF
Expand All @@ -8,8 +8,8 @@ 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 DHCP_VERSION=4.4.3_p1-r1
ARG DNSMASQ_VERSION=2.87-r0
ARG DHCP_VERSION=4.4.3_p1-r2
ARG DNSMASQ_VERSION=2.89-r5

ENV DHCP_BOOT=pxelinux.0 \
DHCP_ENABLE=yes \
Expand Down
4 changes: 2 additions & 2 deletions images/dhcpd-dns-pxe/helm/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ sources:
- https://source.isc.org/git/dhcp.git
- http://thekelleys.org.uk/gitweb/?p=dnsmasq.git
type: application
version: 0.1.8
appVersion: "4.4.3_p1-r1-2.87-r0"
version: 0.1.9
appVersion: "4.4.3_p1-r2-2.89-r5"
dependencies:
- name: chartlib
version: 0.1.8
Expand Down
4 changes: 2 additions & 2 deletions images/dovecot/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM instantlinux/postfix:3.7.3-r1
FROM instantlinux/postfix:3.8.1-r0

MAINTAINER Rich Braun "[email protected]"
ARG BUILD_DATE
Expand All @@ -9,7 +9,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 DOVECOT_VERSION=2.3.20-r6
ARG DOVECOT_VERSION=2.3.20-r10
ARG MKCERT_SHA=24b6988d1709e71c24dcf94ffce5db93bd2e89dc5cbec1ac3c173de5274b68dd

ENV LDAP_PASSWD_SECRET=ldap-ro-password \
Expand Down
4 changes: 2 additions & 2 deletions images/dovecot/helm/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ sources:
- https://github.com/instantlinux/docker-tools
- https://github.com/vdukhovni/dovecot
type: application
version: 0.1.5
appVersion: "2.3.20-r6"
version: 0.1.6
appVersion: "2.3.20-r10"
dependencies:
- name: chartlib
version: 0.1.8
Expand Down
4 changes: 2 additions & 2 deletions images/ez-ipupdate/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.17
FROM alpine:3.18
MAINTAINER Rich Braun "[email protected]"
ARG BUILD_DATE
ARG VCS_REF
Expand All @@ -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 EZ_VERSION=3.0.10-r10
ARG EZ_VERSION=3.0.10-r13
ENV HOST= \
INTERVAL=3600 \
IPLOOKUP_URI=http://ipinfo.io/ip \
Expand Down
4 changes: 2 additions & 2 deletions images/ez-ipupdate/helm/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ sources:
- https://github.com/instantlinux/docker-tools
- https://sourceforge.net/projects/ez-ipupdate/
type: application
version: 0.1.2
appVersion: "3.0.10-r10"
version: 0.1.3
appVersion: "3.0.10-r13"
dependencies:
- name: chartlib
version: 0.1.8
Expand Down
4 changes: 2 additions & 2 deletions images/git-dump/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.17
FROM alpine:3.18
MAINTAINER Rich Braun "[email protected]"
ARG BUILD_DATE
ARG VCS_REF
Expand All @@ -18,7 +18,7 @@ ENV API_TOKEN_SECRET= \
USERNAME=git-dump \
TZ=UTC

ARG GIT_VERSION=2.38.4-r1
ARG GIT_VERSION=2.40.1-r0
ARG GROUP=care
ARG GID=505
ARG UID=212
Expand Down
4 changes: 2 additions & 2 deletions images/git-dump/helm/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ home: https://github.com/instantlinux/docker-tools
sources:
- https://github.com/instantlinux/docker-tools
type: application
version: 0.1.10
appVersion: "2.38.4-r1"
version: 0.1.11
appVersion: "2.40.1-r0"
dependencies:
- name: chartlib
version: 0.1.8
Expand Down
4 changes: 2 additions & 2 deletions images/git-pull/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.17
FROM alpine:3.18
MAINTAINER Rich Braun <[email protected]>
ARG BUILD_DATE
ARG VCS_REF
Expand All @@ -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.38.4-r1
ARG GIT_VERSION=2.40.1-r0
ENV DEST=. \
GIT_COMMIT=master \
GIT_HOST=github.com \
Expand Down
4 changes: 2 additions & 2 deletions images/git-pull/helm/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ home: https://github.com/instantlinux/docker-tools
sources:
- https://github.com/instantlinux/docker-tools
type: application
version: 0.1.8
appVersion: "2.38.4-r1"
version: 0.1.9
appVersion: "2.40.1-r0"
dependencies:
- name: chartlib
version: 0.1.8
Expand Down
2 changes: 1 addition & 1 deletion images/haproxy-keepalived/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM haproxy:2.7.1-alpine
FROM haproxy:2.8.1-alpine
MAINTAINER Rich Braun "[email protected]"
ARG BUILD_DATE
ARG VCS_REF
Expand Down
4 changes: 2 additions & 2 deletions images/haproxy-keepalived/helm/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ sources:
- https://github.com/haproxy/haproxy
- https://github.com/acassen/keepalived
type: application
version: 0.1.9
appVersion: "2.7.1-alpine-2.2.7-r2"
version: 0.1.10
appVersion: "2.8.1-alpine-2.2.7-r2"
dependencies:
- name: chartlib
version: 0.1.8
Expand Down
4 changes: 2 additions & 2 deletions images/mysqldump/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.17
FROM alpine:3.18
MAINTAINER Rich Braun "[email protected]"
ARG BUILD_DATE
ARG VCS_REF
Expand All @@ -19,7 +19,7 @@ ENV HOUR=3 MINUTE=30 \

ARG UID=210
ARG BACKUP_GID=34
ARG CLIENT_VERSION=10.6.11-r0
ARG CLIENT_VERSION=10.11.4-r0

RUN RMGROUP=$(grep :$BACKUP_GID: /etc/group | cut -d: -f 1) && \
[ -z "$RMGROUP" ] || delgroup $RMGROUP && \
Expand Down
4 changes: 2 additions & 2 deletions images/mysqldump/helm/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ sources:
- https://github.com/instantlinux/docker-tools
- https://github.com/mariadb/server/tree/10.5/client
type: application
version: 0.1.6
appVersion: "10.6.11-r0"
version: 0.1.7
appVersion: "10.11.4-r0"
dependencies:
- name: chartlib
version: 0.1.8
Expand Down
6 changes: 3 additions & 3 deletions images/nagios/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.17
FROM alpine:3.18
MAINTAINER Rich Braun "[email protected]"
ARG BUILD_DATE
ARG VCS_REF
Expand All @@ -8,10 +8,10 @@ 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.4.9-r0
ARG NAGIOS_VERSION=4.4.13-r0
ARG NAGIOS_GID=1000
ARG NAGIOS_UID=999
ARG PLUGINS_VERSION=2.4.2-r0
ARG PLUGINS_VERSION=2.4.5-r0
ARG WWW_UID=33
ENV AUTHORIZED_USERS=nagiosadmin \
CONFIG_CHECK=yes \
Expand Down
2 changes: 1 addition & 1 deletion images/nut-upsd/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.17
FROM alpine:3.18
MAINTAINER Rich Braun "[email protected]"
ARG BUILD_DATE
ARG VCS_REF
Expand Down
4 changes: 2 additions & 2 deletions images/openldap/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.17
FROM alpine:3.18
MAINTAINER Rich Braun "[email protected]"
ARG BUILD_DATE
ARG VCS_REF
Expand All @@ -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.3-r6
ARG OPENLDAP_VERSION=2.6.4-r3
ENV SLAPD_DN_ATTR=uid \
SLAPD_FQDN=example.com \
SLAPD_LOG_LEVEL=Config,Stats \
Expand Down
4 changes: 2 additions & 2 deletions images/openldap/helm/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ sources:
- https://github.com/instantlinux/docker-tools
- https://git.openldap.org/openldap/openldap
type: application
version: 0.1.2
appVersion: "2.6.3-r6"
version: 0.1.3
appVersion: "2.6.4-r3"
dependencies:
- name: chartlib
version: 0.1.8
Expand Down
4 changes: 2 additions & 2 deletions images/postfix-python/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG POSTFIX_VERSION=3.7.3-r1
ARG POSTFIX_VERSION=3.8.1-r0

FROM instantlinux/postfix:$POSTFIX_VERSION
MAINTAINER Rich Braun "[email protected]"
Expand All @@ -22,7 +22,7 @@ ENV BLACKLIST_USER_SECRET=mysql-blacklist-user \

ARG GETPIP_SHA=311afebb7cdd310eb3a3a6bb6fffef53d84493db98c7cebf4008a18d3418c8be
ARG GETPIP_URI=https://bootstrap.pypa.io/pip/3.5/get-pip.py
ARG PYTHON_PIP_VERSION=21.1.3
ARG PYTHON_PIP_VERSION=23.1.2

COPY requirements.txt /root/
COPY src/ /usr/local/bin/
Expand Down
4 changes: 2 additions & 2 deletions images/postfix-python/helm/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ sources:
- https://github.com/instantlinux/docker-tools
- https://github.com/vdukhovni/postfix
type: application
version: 0.1.8
appVersion: "3.7.3-r1"
version: 0.1.9
appVersion: "3.8.1-r0"
dependencies:
- name: chartlib
version: 0.1.8
Expand Down
4 changes: 2 additions & 2 deletions images/postfix/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.17
FROM alpine:3.18
MAINTAINER Rich Braun "[email protected]"
ARG BUILD_DATE
ARG VCS_REF
Expand All @@ -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 POSTFIX_VERSION=3.7.3-r1
ARG POSTFIX_VERSION=3.8.1-r0
ENV SASL_PASSWD_SECRET=postfix-sasl-passwd \
TZ=UTC

Expand Down
4 changes: 2 additions & 2 deletions images/proftpd/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.17
FROM alpine:3.18
MAINTAINER Rich Braun "[email protected]"
ARG BUILD_DATE
ARG VCS_REF
Expand All @@ -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.7f-r1
ARG PROFTPD_VERSION=1.3.8-r3
ENV ALLOW_OVERWRITE=on \
ANONYMOUS_DISABLE=off \
ANON_UPLOAD_ENABLE=DenyAll \
Expand Down
4 changes: 2 additions & 2 deletions images/proftpd/helm/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ sources:
- https://github.com/instantlinux/docker-tools
- https://github.com/proftpd/proftpd
type: application
version: 0.1.4
appVersion: "1.3.7f-r1"
version: 0.1.5
appVersion: "1.3.8-r3"
dependencies:
- name: chartlib
version: 0.1.8
Expand Down
4 changes: 2 additions & 2 deletions images/rsyslogd/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.17
FROM alpine:3.18
MAINTAINER Rich Braun "[email protected]"
ARG BUILD_DATE
ARG VCS_REF
Expand All @@ -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.2210.0-r0
ARG RSYSLOG_VERSION=8.2306.0-r0
ENV TZ=UTC
RUN apk add --update gzip logrotate rsyslog=$RSYSLOG_VERSION \
rsyslog-mysql=$RSYSLOG_VERSION tar xz && \
Expand Down
4 changes: 2 additions & 2 deletions images/rsyslogd/helm/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ sources:
- https://github.com/instantlinux/docker-tools
- https://github.com/rsyslog/rsyslog
type: application
version: 0.1.7
appVersion: "8.2210.0-r0"
version: 0.1.8
appVersion: "8.2306.0-r0"
dependencies:
- name: chartlib
version: 0.1.8
Expand Down
4 changes: 2 additions & 2 deletions images/samba-dc/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.17
FROM alpine:3.18
MAINTAINER Rich Braun "[email protected]"
ARG BUILD_DATE
ARG VCS_REF
Expand All @@ -24,7 +24,7 @@ ENV ADMIN_PASSWORD_SECRET=samba-admin-password \
WINBIND_USE_DEFAULT_DOMAIN=yes \
WORKGROUP=AD

ARG SAMBA_VERSION=4.16.8-r0
ARG SAMBA_VERSION=4.18.3-r0

COPY *.conf.j2 /root/
COPY entrypoint.sh /usr/local/bin/
Expand Down
4 changes: 2 additions & 2 deletions images/samba-dc/helm/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ sources:
- https://github.com/instantlinux/docker-tools
- ttps://gitlab.com/samba-team/samba
type: application
version: 0.1.8
appVersion: "4.16.8-r0"
version: 0.1.9
appVersion: "4.18.3-r0"
dependencies:
- name: chartlib
version: 0.1.8
Expand Down
4 changes: 2 additions & 2 deletions images/samba/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.17
FROM alpine:3.18
MAINTAINER Rich Braun "[email protected]"
ARG BUILD_DATE
ARG VCS_REF
Expand All @@ -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 SAMBA_VERSION=4.16.8-r0
ARG SAMBA_VERSION=4.18.3-r0
ENV LOGON_DRIVE=H \
NETBIOS_NAME=samba \
SERVER_STRING="Samba Server" \
Expand Down
Loading

0 comments on commit b07eaa2

Please sign in to comment.