Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SYS-619 roll back weewx / haproxy-keepalived; update a few helm charts #145

Merged
merged 1 commit into from
Dec 20, 2023
Merged

SYS-619 roll back weewx / haproxy-keepalived; update a few helm charts #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions images/dovecot/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM instantlinux/postfix:3.8.2-r0
FROM instantlinux/postfix:3.8.3-r1

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-r11
ARG DOVECOT_VERSION=2.3.21-r17
ARG MKCERT_SHA=24b6988d1709e71c24dcf94ffce5db93bd2e89dc5cbec1ac3c173de5274b68dd

ENV LDAP_PASSWD_SECRET=ldap-ro-password \
Expand All @@ -21,7 +21,7 @@ RUN echo '@old http://dl-cdn.alpinelinux.org/alpine/v3.11/main' \
apk add --no-cache dovecot=$DOVECOT_VERSION dovecot-ldap=$DOVECOT_VERSION \
procmail@old && \
rm /etc/ssl/dovecot/server.* && cd /usr/local/bin && \
wget -q https://raw.githubusercontent.com/dovecot/core/release-2.3.13/doc/mkcert.sh && \
wget -q https://raw.githubusercontent.com/dovecot/core/release-2.3.21/doc/mkcert.sh && \
echo "$MKCERT_SHA mkcert.sh" | sha256sum -c && \
chmod 755 /usr/local/bin/mkcert.sh

Expand Down
4 changes: 2 additions & 2 deletions images/dovecot/helm/Chart.yaml
View file
Open in desktop
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.7
appVersion: "2.3.20-r11"
version: 0.1.8
appVersion: "2.3.21-r17"
dependencies:
- name: chartlib
version: 0.1.8
Expand Down
2 changes: 1 addition & 1 deletion images/haproxy-keepalived/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM haproxy:2.9.1-alpine
FROM haproxy:2.8.3-alpine
MAINTAINER Rich Braun "[email protected]"
ARG BUILD_DATE
ARG VCS_REF
Expand Down
2 changes: 1 addition & 1 deletion images/haproxy-keepalived/helm/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ sources:
- https://github.com/acassen/keepalived
type: application
version: 0.1.14
appVersion: "2.9.1-alpine-2.2.8-r0"
appVersion: "2.8.3-alpine-2.2.8-r0"
dependencies:
- name: chartlib
version: 0.1.8
Expand Down
2 changes: 1 addition & 1 deletion images/mysqldump/helm/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ sources:
- https://github.com/instantlinux/docker-tools
- https://github.com/mariadb/server/tree/10.5/client
type: application
version: 0.1.8git
version: 0.1.8
appVersion: "10.11.5-r3"
dependencies:
- name: chartlib
Expand Down
2 changes: 1 addition & 1 deletion images/openldap/helm/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ sources:
- https://git.openldap.org/openldap/openldap
type: application
version: 0.1.5
appVersion: "2.6.6-r0"
appVersion: "2.6.6-r1"
dependencies:
- name: chartlib
version: 0.1.8
Expand Down
2 changes: 1 addition & 1 deletion images/samba-dc/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ COPY *.conf.j2 /root/
COPY entrypoint.sh /usr/local/bin/
RUN apk add --update --no-cache krb5 ldb-tools samba-dc=$SAMBA_VERSION samba-winbind-clients=$SAMBA_VERSION tdb \
bind bind-libs bind-tools libcrypto3 libxml2 tzdata py3-setuptools py3-pip && \
pip install j2cli && \
pip install j2cli --break-system-packages && \
apk del py3-pip && \
chmod 0755 /usr/local/bin/entrypoint.sh

Expand Down
2 changes: 1 addition & 1 deletion images/weewx/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.19
FROM alpine:3.18
MAINTAINER Rich Braun "[email protected]"
ARG BUILD_DATE
ARG VCS_REF
Expand Down
4 changes: 2 additions & 2 deletions k8s/helm/gitlab/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ sources:
- https://github.com/instantlinux/docker-tools
- https://gitlab.com/gitlab-org/gitlab
type: application
version: 0.1.8
appVersion: "16.5.0-ce.0"
version: 0.1.9
appVersion: "16.6.2-ce.0"
dependencies:
- name: chartlib
version: 0.1.8
Expand Down
8 changes: 4 additions & 4 deletions k8s/helm/guacamole/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ sources:
- https://github.com/apache/guacamole-client
- https://github.com/apache/guacamole-server
type: application
version: 0.1.3
appVersion: "1.5.3"
version: 0.1.4
appVersion: "1.5.4"
dependencies:
- name: chartlib
version: 0.1.8
repository: https://instantlinux.github.io/docker-tools
- name: guacamole-server
version: 0.1.2
version: 0.1.3
repository: file://subcharts/guacamole-server
- name: guacd
version: 0.1.2
version: 0.1.3
repository: file://subcharts/guacd
4 changes: 2 additions & 2 deletions k8s/helm/guacamole/subcharts/guacamole-server/Chart.yaml
View file
Open in desktop
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/apache/guacamole-server
type: application
version: 0.1.2
appVersion: "1.5.3"
version: 0.1.3
appVersion: "1.5.4"
dependencies:
- name: chartlib
version: 0.1.5
Expand Down
4 changes: 2 additions & 2 deletions k8s/helm/guacamole/subcharts/guacd/Chart.yaml
View file
Open in desktop
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/apache/guacamole-client
type: application
version: 0.1.2
appVersion: "1.5.3"
version: 0.1.3
appVersion: "1.5.4"
dependencies:
- name: chartlib
version: 0.1.5
Expand Down
4 changes: 2 additions & 2 deletions k8s/helm/splunk/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ sources:
- https://github.com/instantlinux/docker-tools
- https://hub.docker.com/r/splunk/splunk
type: application
version: 0.1.8
appVersion: "9.1.1"
version: 0.1.9
appVersion: "9.1.2"
dependencies:
- name: chartlib
version: 0.1.8
Expand Down
4 changes: 4 additions & 0 deletions lib/build/Makefile.docker_image
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ endif
ifeq ($(IMAGE),nagiosql)
PLATFORMS = linux/amd64,linux/arm64,linux/arm/v7
endif
ifeq ($(IMAGE),postfix-python)
# qemu bombs out with cpu_exec assertion since Dec 2023 on arm/v7
PLATFORMS = linux/amd64,linux/aarch64,linux/arm64
endif
ifeq ($(IMAGE),$(filter $(IMAGE),python-builder python-wsgi))
# helm package on arm/v6 isn't supported as of Aug 2021
# others had issues with pipenv hashes Jul 2023
Expand Down
Loading