SYS-573 Image updates for Jan 2022

instantlinux · Jan 26, 2022 · fcbc1ad · fcbc1ad
1 parent 8d2f6ec
commit fcbc1ad
Show file tree

Hide file tree

Showing 22 changed files with 336 additions and 362 deletions.
diff --git a/images/dhcpd-dns-pxe/Dockerfile b/images/dhcpd-dns-pxe/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.14
+FROM alpine:3.15
 MAINTAINER Rich Braun "docker@instantlinux.net"
 ARG BUILD_DATE
 ARG VCS_REF
@@ -9,7 +9,7 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
     org.label-schema.vcs-url=https://github.com/instantlinux/docker-tools
 
 ARG DHCP_VERSION=4.4.2_p1-r0
-ARG DNSMASQ_VERSION=2.85-r2
+ARG DNSMASQ_VERSION=2.86-r0
 
 ENV DHCP_BOOT=pxelinux.0 \
     DHCP_ENABLE=yes \

diff --git a/images/dhcpd-dns-pxe/helm/Chart.yaml b/images/dhcpd-dns-pxe/helm/Chart.yaml
@@ -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.1
-appVersion: "4.4.2_p1-r0-2.85-r2"
+version: 0.1.2
+appVersion: "4.4.2_p1-r0-2.86-r0"
 dependencies:
 - name: chartlib
   version: 0.1.8

diff --git a/images/haproxy-keepalived/Dockerfile b/images/haproxy-keepalived/Dockerfile
@@ -1,4 +1,4 @@
-FROM haproxy:2.4.10-alpine
+FROM haproxy:2.5.1-alpine
 MAINTAINER Rich Braun "docker@instantlinux.net"
 ARG BUILD_DATE
 ARG VCS_REF

diff --git a/images/haproxy-keepalived/helm/Chart.yaml b/images/haproxy-keepalived/helm/Chart.yaml
@@ -8,7 +8,7 @@ sources:
 - https://github.com/acassen/keepalived
 type: application
 version: 0.1.3
-appVersion: "2.4.10-alpine-2.2.4-r2"
+appVersion: "2.5.1-alpine-2.2.4-r2"
 dependencies:
 - name: chartlib
   version: 0.1.8

diff --git a/images/postfix-python/Dockerfile b/images/postfix-python/Dockerfile
@@ -1,4 +1,4 @@
-ARG POSTFIX_VERSION=3.6.3-r1
+ARG POSTFIX_VERSION=3.6.4-r0
 
 FROM instantlinux/postfix:$POSTFIX_VERSION
 MAINTAINER Rich Braun "docker@instantlinux.net"

diff --git a/images/postfix-python/helm/Chart.yaml b/images/postfix-python/helm/Chart.yaml
@@ -6,8 +6,8 @@ sources:
 - https://github.com/instantlinux/docker-tools
 - https://github.com/vdukhovni/postfix
 type: application
-version: 0.1.3
-appVersion: "3.6.3-r1"
+version: 0.1.4
+appVersion: "3.6.4-r0"
 dependencies:
 - name: chartlib
   version: 0.1.8

diff --git a/images/postfix/Dockerfile b/images/postfix/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 POSTFIX_VERSION=3.6.3-r1
+ARG POSTFIX_VERSION=3.6.4-r0
 ENV SASL_PASSWD_SECRET=postfix-sasl-passwd \
     TZ=UTC
 

diff --git a/images/python-builder/Dockerfile b/images/python-builder/Dockerfile
@@ -11,17 +11,17 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
 ENV BUILD_DIR=/build \
     BUILD_USER=build \
     LANG=en_US \
-    PYTHONPATH=/usr/lib/python3.9/site-packages \
+    PYTHONPATH=/usr/lib/python3.10/site-packages \
     TZ=UTC
 
 ARG BUILDX_VERSION=0.7.1
 ARG COMPOSE_VERSION=1.29.2
-ARG HELM_VERSION=3.7.1-r0
+ARG HELM_VERSION=3.7.2-r0
 ARG KUBECTL_VERSION=1.20.4
 ARG MUSL_VERSION=1.2.2-r7
 ARG PYTHON_VERSION=3.9.7-r4
 ARG PYCRYPTOGRAPHY_VERSION=3.3.2-r3
-ARG PYPILLOW_VERSION=8.4.0-r1
+ARG PYPILLOW_VERSION=9.0.0-r0
 ARG _DOCKER_DOWNLOADS=https://github.com/docker/compose/releases/download
 ARG _KUBECTL_DOWNLOADS=https://storage.googleapis.com/kubernetes-release/release
 ARG _BUILDX_URL=https://github.com/docker/buildx/releases/download/v${BUILDX_VERSION}/buildx-v${BUILDX_VERSION}.linux-amd64
@@ -38,6 +38,8 @@ COPY Pipfile* /root/
 RUN addgroup -g $DOCKER_GID docker && \
     adduser -D -h $BUILD_DIR -u $BUILD_UID -G docker \
       -s /bin/bash $BUILD_USER && \
+    echo '@edge http://dl-cdn.alpinelinux.org/alpine/edge/community' \
+      >>/etc/apk/repositories && \
     echo '@testing http://dl-cdn.alpinelinux.org/alpine/edge/testing' \
       >>/etc/apk/repositories && \
     apk add --update --no-cache \
@@ -47,7 +49,7 @@ RUN addgroup -g $DOCKER_GID docker && \
       py3-cachetools py3-cffi py3-cryptography==$PYCRYPTOGRAPHY_VERSION \
       py3-pycryptodomex py3-flask py3-flask-babel py3-greenlet \
       py3-itsdangerous py3-passlib \
-      py3-pillow=$PYPILLOW_VERSION py3-pip py3-requests py3-virtualenv \
+      py3-pillow@edge=$PYPILLOW_VERSION py3-pip py3-requests py3-virtualenv \
       helm@testing=$HELM_VERSION sqlite tar tzdata wget && \
     cp /usr/share/zoneinfo/$TZ /etc/localtime && \
     echo $TZ >/etc/timezone && \

diff --git a/images/python-builder/Pipfile b/images/python-builder/Pipfile
@@ -18,7 +18,7 @@ greenlet = "==1.1.2"
 itsdangerous = "==2.0.1"
 packaging = "==20.9"
 passlib = "1.7.4"
-Pillow = "==8.4.0"
+Pillow = "==9.0.0"
 pycryptodomex = "==3.10.1"
 python-dateutil = "==2.8.2"
 requests = "==2.26.0"

diff --git a/images/python-builder/Pipfile.lock b/images/python-builder/Pipfile.lock
diff --git a/images/python-wsgi/Dockerfile b/images/python-wsgi/Dockerfile
@@ -9,19 +9,22 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
     org.label-schema.name=python-wsgi \
     org.label-schema.vcs-ref=$VCS_REF \
     org.label-schema.vcs-url=https://github.com/instantlinux/python-wsgi
+ENV PYTHONPATH=/usr/lib/python3.10/site-packages
 ARG PYTHON_VERSION=3.9.7-r4
 ARG PYCRYPTOGRAPHY_VERSION=3.3.2-r3
-ARG PYPILLOW_VERSION=8.4.0-r1
+ARG PYPILLOW_VERSION=9.0.0-r0
 ARG UWSGI_VERSION=2.0.19.1-r2
 
 COPY Pipfile* uwsgi.ini /usr/src/
-RUN apk add --virtual .fetch-deps gcc git jpeg-dev linux-headers make \
+RUN echo '@edge http://dl-cdn.alpinelinux.org/alpine/edge/community' \
+      >>/etc/apk/repositories && \
+    apk add --virtual .fetch-deps gcc git jpeg-dev linux-headers make \
       musl-dev libwebp-dev openssl-dev pcre-dev python3-dev zlib-dev && \
     apk add --update --no-cache geos jpeg libjpeg-turbo libwebp \
       proj py3-authlib py3-boto3 py3-botocore py3-cachetools \
       py3-cffi py3-cryptography==$PYCRYPTOGRAPHY_VERSION py3-pip \
       py3-pycryptodomex py3-flask py3-flask-babel py3-greenlet py3-itsdangerous \
-      py3-passlib py3-pillow=$PYPILLOW_VERSION py3-requests py3-setuptools \
+      py3-passlib py3-pillow@edge=$PYPILLOW_VERSION py3-requests py3-setuptools \
       py3-virtualenv python3==$PYTHON_VERSION uwsgi==$UWSGI_VERSION \
       uwsgi-python3 zlib && \
     pip install --upgrade pipenv pip && \

diff --git a/images/python-wsgi/Pipfile b/images/python-wsgi/Pipfile
@@ -16,8 +16,9 @@ Flask = "==2.0.2"
 Flask-Babel = "==2.0.0"
 greenlet == "==1.1.2"
 itsdangerous = "==2.0.1"
+packaging = "==20.9"
 passlib = "==1.7.4"
-Pillow = "==8.4.0"
+Pillow = "==9.0.0"
 pycryptodomex = "==3.10.1"
 python-dateutil = "==2.8.2"
 requests = "==2.26.0"