From d5740c480dbfac09bc9719474a1c65b647f9ad03 Mon Sep 17 00:00:00 2001 From: Ryan Voots Date: Thu, 8 May 2025 12:06:06 -0400 Subject: [PATCH] Dockerfile now works for new tags --- general/Dockerfile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/general/Dockerfile b/general/Dockerfile index 5594832..92b450e 100644 --- a/general/Dockerfile +++ b/general/Dockerfile @@ -1,6 +1,10 @@ -ARG BASE_IMAGE_TAG=latest +ARG PG_MAJOR_VERSION=17 +ARG DEB_RELEASE=bookworm +ARG FMT_DATE=2025-05-08 -FROM gitea.simcop2387.info/simcop2387/pg-container-base:${BASE_IMAGE_TAG} AS pgbuilder +ARG BASE_IMAGE_TAG=${PG_MAJOR_VERSION}-${DEB_RELEASE}-${FMT_DATE} + +FROM gitea.simcop2387.info/simcop2387/postgresql-container-base:${BASE_IMAGE_TAG} AS pgbuilder ARG POSTGIS_VERSION= ARG PGVECTOR_VERSION= @@ -19,7 +23,7 @@ RUN cd build && make -j && make install # TODO UPDATE PGCONFIG # shared_preload_libraries = 'timescaledb' -FROM gitea.simcop2387.info/simcop2387/pg-container-base:${BASE_IMAGE_TAG} +FROM gitea.simcop2387.info/simcop2387/postgresql-container-base:${BASE_IMAGE_TAG} COPY --from=pgbuilder /usr/share/postgresql/ /usr/share/posrgresql/ COPY --from=pgbuilder /usr/lib/postgresql/ /usr/lib/postgresql/