Skip to content

Commit fcbc1ad

Browse files
committed
SYS-573 Image updates for Jan 2022
1 parent 8d2f6ec commit fcbc1ad

22 files changed

Lines changed: 336 additions & 362 deletions

File tree

images/dhcpd-dns-pxe/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM alpine:3.14
1+
FROM alpine:3.15
22
MAINTAINER Rich Braun "docker@instantlinux.net"
33
ARG BUILD_DATE
44
ARG VCS_REF
@@ -9,7 +9,7 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
99
org.label-schema.vcs-url=https://github.com/instantlinux/docker-tools
1010

1111
ARG DHCP_VERSION=4.4.2_p1-r0
12-
ARG DNSMASQ_VERSION=2.85-r2
12+
ARG DNSMASQ_VERSION=2.86-r0
1313

1414
ENV DHCP_BOOT=pxelinux.0 \
1515
DHCP_ENABLE=yes \

images/dhcpd-dns-pxe/helm/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ sources:
77
- https://source.isc.org/git/dhcp.git
88
- http://thekelleys.org.uk/gitweb/?p=dnsmasq.git
99
type: application
10-
version: 0.1.1
11-
appVersion: "4.4.2_p1-r0-2.85-r2"
10+
version: 0.1.2
11+
appVersion: "4.4.2_p1-r0-2.86-r0"
1212
dependencies:
1313
- name: chartlib
1414
version: 0.1.8

images/haproxy-keepalived/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM haproxy:2.4.10-alpine
1+
FROM haproxy:2.5.1-alpine
22
MAINTAINER Rich Braun "docker@instantlinux.net"
33
ARG BUILD_DATE
44
ARG VCS_REF

images/haproxy-keepalived/helm/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ sources:
88
- https://github.com/acassen/keepalived
99
type: application
1010
version: 0.1.3
11-
appVersion: "2.4.10-alpine-2.2.4-r2"
11+
appVersion: "2.5.1-alpine-2.2.4-r2"
1212
dependencies:
1313
- name: chartlib
1414
version: 0.1.8

images/postfix-python/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG POSTFIX_VERSION=3.6.3-r1
1+
ARG POSTFIX_VERSION=3.6.4-r0
22

33
FROM instantlinux/postfix:$POSTFIX_VERSION
44
MAINTAINER Rich Braun "docker@instantlinux.net"

images/postfix-python/helm/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ sources:
66
- https://github.com/instantlinux/docker-tools
77
- https://github.com/vdukhovni/postfix
88
type: application
9-
version: 0.1.3
10-
appVersion: "3.6.3-r1"
9+
version: 0.1.4
10+
appVersion: "3.6.4-r0"
1111
dependencies:
1212
- name: chartlib
1313
version: 0.1.8

images/postfix/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
88
org.label-schema.vcs-ref=$VCS_REF \
99
org.label-schema.vcs-url=https://github.com/instantlinux/docker-tools
1010

11-
ARG POSTFIX_VERSION=3.6.3-r1
11+
ARG POSTFIX_VERSION=3.6.4-r0
1212
ENV SASL_PASSWD_SECRET=postfix-sasl-passwd \
1313
TZ=UTC
1414

images/python-builder/Dockerfile

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
1111
ENV BUILD_DIR=/build \
1212
BUILD_USER=build \
1313
LANG=en_US \
14-
PYTHONPATH=/usr/lib/python3.9/site-packages \
14+
PYTHONPATH=/usr/lib/python3.10/site-packages \
1515
TZ=UTC
1616

1717
ARG BUILDX_VERSION=0.7.1
1818
ARG COMPOSE_VERSION=1.29.2
19-
ARG HELM_VERSION=3.7.1-r0
19+
ARG HELM_VERSION=3.7.2-r0
2020
ARG KUBECTL_VERSION=1.20.4
2121
ARG MUSL_VERSION=1.2.2-r7
2222
ARG PYTHON_VERSION=3.9.7-r4
2323
ARG PYCRYPTOGRAPHY_VERSION=3.3.2-r3
24-
ARG PYPILLOW_VERSION=8.4.0-r1
24+
ARG PYPILLOW_VERSION=9.0.0-r0
2525
ARG _DOCKER_DOWNLOADS=https://github.com/docker/compose/releases/download
2626
ARG _KUBECTL_DOWNLOADS=https://storage.googleapis.com/kubernetes-release/release
2727
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/
3838
RUN addgroup -g $DOCKER_GID docker && \
3939
adduser -D -h $BUILD_DIR -u $BUILD_UID -G docker \
4040
-s /bin/bash $BUILD_USER && \
41+
echo '@edge http://dl-cdn.alpinelinux.org/alpine/edge/community' \
42+
>>/etc/apk/repositories && \
4143
echo '@testing http://dl-cdn.alpinelinux.org/alpine/edge/testing' \
4244
>>/etc/apk/repositories && \
4345
apk add --update --no-cache \
@@ -47,7 +49,7 @@ RUN addgroup -g $DOCKER_GID docker && \
4749
py3-cachetools py3-cffi py3-cryptography==$PYCRYPTOGRAPHY_VERSION \
4850
py3-pycryptodomex py3-flask py3-flask-babel py3-greenlet \
4951
py3-itsdangerous py3-passlib \
50-
py3-pillow=$PYPILLOW_VERSION py3-pip py3-requests py3-virtualenv \
52+
py3-pillow@edge=$PYPILLOW_VERSION py3-pip py3-requests py3-virtualenv \
5153
helm@testing=$HELM_VERSION sqlite tar tzdata wget && \
5254
cp /usr/share/zoneinfo/$TZ /etc/localtime && \
5355
echo $TZ >/etc/timezone && \

images/python-builder/Pipfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ greenlet = "==1.1.2"
1818
itsdangerous = "==2.0.1"
1919
packaging = "==20.9"
2020
passlib = "1.7.4"
21-
Pillow = "==8.4.0"
21+
Pillow = "==9.0.0"
2222
pycryptodomex = "==3.10.1"
2323
python-dateutil = "==2.8.2"
2424
requests = "==2.26.0"

images/python-builder/Pipfile.lock

Lines changed: 179 additions & 205 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)