From e5708123da6ab09746802d631d88740ebe18ce82 Mon Sep 17 00:00:00 2001 From: Wade Barnes Date: Wed, 5 Apr 2023 07:51:35 -0700 Subject: [PATCH 1/2] Upgrade to Postgres 14 and go-crond 23.2.0 Signed-off-by: Wade Barnes --- docker/Dockerfile | 6 +++--- docker/Dockerfile_MSSQL | 2 +- docker/Dockerfile_MariaDB | 2 +- docker/Dockerfile_Mongo | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 928bfc0..085e336 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,5 +1,5 @@ -# This image provides a postgres installation from which to run backups -FROM centos/postgresql-13-centos7:20210722-70dc4d3 +# This image provides a postgres installation from which to run backups +FROM quay.io/fedora/postgresql-14:14 # Change timezone to PST for convenience ENV TZ=PST8PDT @@ -17,7 +17,7 @@ COPY backup.* / # - https://blog.danman.eu/cron-jobs-in-openshift/ # -------------------------------------------------------------------------------------------------------- ARG SOURCE_REPO=webdevops -ARG GOCROND_VERSION=22.9.1 +ARG GOCROND_VERSION=23.2.0 ADD https://github.com/$SOURCE_REPO/go-crond/releases/download/$GOCROND_VERSION/go-crond.linux.amd64 /usr/bin/go-crond USER root diff --git a/docker/Dockerfile_MSSQL b/docker/Dockerfile_MSSQL index cdf848f..30dd72c 100644 --- a/docker/Dockerfile_MSSQL +++ b/docker/Dockerfile_MSSQL @@ -16,7 +16,7 @@ COPY backup.* / # - https://blog.danman.eu/cron-jobs-in-openshift/ # -------------------------------------------------------------------------------------------------------- ARG SOURCE_REPO=webdevops -ARG GOCROND_VERSION=22.9.1 +ARG GOCROND_VERSION=23.2.0 ADD https://github.com/$SOURCE_REPO/go-crond/releases/download/$GOCROND_VERSION/go-crond.linux.amd64 /usr/bin/go-crond USER root diff --git a/docker/Dockerfile_MariaDB b/docker/Dockerfile_MariaDB index 018a0be..ce0da9c 100644 --- a/docker/Dockerfile_MariaDB +++ b/docker/Dockerfile_MariaDB @@ -16,7 +16,7 @@ COPY backup.* / # - https://blog.danman.eu/cron-jobs-in-openshift/ # -------------------------------------------------------------------------------------------------------- ARG SOURCE_REPO=webdevops -ARG GOCROND_VERSION=22.9.1 +ARG GOCROND_VERSION=23.2.0 ADD https://github.com/$SOURCE_REPO/go-crond/releases/download/$GOCROND_VERSION/go-crond.linux.amd64 /usr/bin/go-crond USER root diff --git a/docker/Dockerfile_Mongo b/docker/Dockerfile_Mongo index 2e6e24b..d5f45a9 100644 --- a/docker/Dockerfile_Mongo +++ b/docker/Dockerfile_Mongo @@ -1,4 +1,4 @@ -# This image provides a mongo installation from which to run backups +# This image provides a mongo installation from which to run backups FROM registry.access.redhat.com/rhscl/mongodb-36-rhel7 # Change timezone to PST for convenience @@ -17,7 +17,7 @@ COPY backup.* / # - https://blog.danman.eu/cron-jobs-in-openshift/ # -------------------------------------------------------------------------------------------------------- ARG SOURCE_REPO=webdevops -ARG GOCROND_VERSION=22.9.1 +ARG GOCROND_VERSION=23.2.0 ADD https://github.com/$SOURCE_REPO/go-crond/releases/download/$GOCROND_VERSION/go-crond.linux.amd64 /usr/bin/go-crond USER root From 664e4010bce78c0b6a8fbc0b0c42ff40fe2eb3bb Mon Sep 17 00:00:00 2001 From: Wade Barnes Date: Tue, 11 Apr 2023 11:10:55 -0700 Subject: [PATCH 2/2] Install missing package Signed-off-by: Wade Barnes --- docker/Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker/Dockerfile b/docker/Dockerfile index 085e336..db809d3 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -31,6 +31,9 @@ RUN chmod +x /usr/bin/go-crond RUN echo $TZ > /etc/timezone # ======================================================================================================== +# The column command is missing from quay.io/fedora/postgresql-14:14 +RUN dnf install -y util-linux + # Important - Reset to the base image's user account. USER 26