From 989c4f0c59c0a820bf56edfca0fd1e174ca5c0ea Mon Sep 17 00:00:00 2001 From: Cresson Remi <remi.cresson@irstea.fr> Date: Thu, 9 Feb 2023 13:27:35 +0100 Subject: [PATCH] Update Dockerfile --- Dockerfile | 25 +++---------------------- 1 file changed, 3 insertions(+), 22 deletions(-) diff --git a/Dockerfile b/Dockerfile index cf2ffc5..a7387b7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,10 +2,6 @@ FROM centos/postgresql-95-centos7 as pg LABEL maintainer="David Bitner / Remi Cresson" -ENV POSTGIS_MAJOR 3 -ENV PGUSER postgres -ENV PGDATABASE postgres -ENV PGHOST localhost ENV \ PYTHONUNBUFFERED=1 \ PYTHONFAULTHANDLER=1 \ @@ -17,14 +13,6 @@ USER root RUN \ yum install -y \ git \ - gnupg \ - apt-transport-https \ - debian-archive-keyring \ - software-properties-common \ - postgresql-$PG_MAJOR-pgtap \ - postgresql-$PG_MAJOR-partman \ - postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \ - postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ build-essential \ python3 \ python3-pip \ @@ -33,15 +21,11 @@ RUN pip3 install -U pip setuptools packaging \ && pip3 install -U psycopg2-binary \ && pip3 install -U psycopg[binary] \ && pip3 install -U migra[pg] \ - && yum remove -y apt-transport-https \ && yum -y autoremove \ && rm -rf /var/lib/apt/lists/* EXPOSE 5432 -RUN mkdir -p /docker-entrypoint-initdb.d -RUN echo "#!/bin/bash \n unset PGHOST \n pypgstac migrate" >/docker-entrypoint-initdb.d/initpgstac.sh && chmod +x /docker-entrypoint-initdb.d/initpgstac.sh - RUN git clone https://github.com/stac-utils/pgstac \ && cd pgstac/pypgstac \ && sed -i 's/python_requires=">=3.7"/python_requires=">=3.6"/g' setup.py \ @@ -51,9 +35,6 @@ RUN git clone https://github.com/stac-utils/pgstac \ ENV POSTGRESQL_USER=username ENV POSTGRESQL_PASSWORD=password -ENV POSTGRESQL_DB=postgis -ENV PGUSER=username -ENV PGPASSWORD=password -ENV PGHOST=localhost -ENV PGDATABASE=postgis -USER 1001 +ENV POSTGRESQL_DATABASE=postgis + +USER postgres -- GitLab