From 9f2f88043f0d22bc309c767be9799906ee110e77 Mon Sep 17 00:00:00 2001 From: Torsten Raudssus Date: Mon, 20 Mar 2023 04:46:47 +0100 Subject: [PATCH] Added up SRV_APT_GET_INSTALL feature --- .gitlab-ci.yml | 2 +- Dockerfile | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index da971f5..411ecf9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,7 +18,7 @@ build: - docker build -t $IMAGE_TAG . - docker push $IMAGE_TAG -release-image: +release: stage: release script: - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY diff --git a/Dockerfile b/Dockerfile index e5e283e..9aa3699 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,6 +7,7 @@ ARG SRV_VERSION="0" ENV SRV_UID $SRV_UID ENV SRV_GID $SRV_GID ENV SRV_VERSION $SRV_VERSION +ENV SRV_APT_GET_INSTALL $SRV_APT_GET_INSTALL ENV DEBIAN_FRONTEND "noninteractive" ENV PGDATA "/pgdata" @@ -26,7 +27,7 @@ RUN if [ -z "$( getent group $SRV_GID )" ] ; then groupadd -r postgres --gid=$SR postgresql-15-pgrouting-scripts postgresql-15-pgsphere postgresql-15-postgis-3 \ postgresql-15-postgis-3-scripts postgresql-15-repack postgresql-15-set-user \ postgresql-15-similarity postgresql-15-pgpool2 postgresql-15-semver \ - postgresql-15-tablelog postgresql-15-wal2json && \ + postgresql-15-tablelog postgresql-15-wal2json $SRV_APT_GET_INSTALL && \ apt-get clean ENV PATH="/usr/lib/postgresql/15/bin:$PATH"