From e79a054aa43e1ea95f3b3a36a528355be6722549 Mon Sep 17 00:00:00 2001 From: f Date: Wed, 16 Aug 2023 12:54:24 -0300 Subject: [PATCH] feat: install specific versions so we can apply security upgrades --- .woodpecker.yml | 6 ++++++ Dockerfile | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index cb4e7e2..4392cbe 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -22,18 +22,24 @@ matrix: - ALPINE_VERSION: "3.18.3" PG_VERSION: "15" PG_VERSION_APPENDED: "15" + PG_VERSION_FULL: "15.4" - ALPINE_VERSION: "3.17.5" PG_VERSION: "10" PG_VERSION_APPENDED: "10" + PG_VERSION_FULL: "10.23" - ALPINE_VERSION: "3.17.5" PG_VERSION: "12" PG_VERSION_APPENDED: "12" + PG_VERSION_FULL: "12.16" - ALPINE_VERSION: "3.17.5" PG_VERSION: "13" PG_VERSION_APPENDED: "13" + PG_VERSION_FULL: "13.12" - ALPINE_VERSION: "3.17.5" PG_VERSION: "14" PG_VERSION_APPENDED: "14" + PG_VERSION_FULL: "14.9" - ALPINE_VERSION: "3.17.5" PG_VERSION: "15" PG_VERSION_APPENDED: "15" + PG_VERSION_FULL: "15.4" diff --git a/Dockerfile b/Dockerfile index 0b45ee1..efb0e2d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,6 +4,7 @@ FROM ${BASE_IMAGE}:${ALPINE_VERSION} MAINTAINER "f " ARG PG_VERSION=13 ARG PG_VERSION_APPENDED +ARG PG_VERSION_FULL ENV PGVER=$PG_VERSION ENV PGBASE=/var/lib/postgresql @@ -12,7 +13,7 @@ ENV PAGER="less -niSFX" # Starting from Alpine 3.15 there are several PostgreSQL versions # supported. -RUN apk add --no-cache postgresql${PG_VERSION_APPENDED} postgresql${PG_VERSION_APPENDED}-contrib daemonize less +RUN apk add --no-cache postgresql${PG_VERSION_APPENDED}~${PG_VERSION_FULL} postgresql${PG_VERSION_APPENDED}-contrib daemonize less RUN install -dm 750 -o postgres -g postgres /etc/postgres.d COPY ./monit.conf /etc/monit.d/postgresql.conf