diff --git a/Dockerfile b/Dockerfile index 05c761d..a7247db 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,8 +10,8 @@ ENV UPDATES=disabled RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone # Install dependencies -RUN apt-get update \ - && apt-get install wget gnupg2 lsb-core -y \ +RUN apt-get update \ + && apt-get install wget gnupg2 lsb-core -y \ && wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \ && echo "deb [ trusted=yes ] http://apt.postgresql.org/pub/repos/apt/ `lsb_release -cs`-pgdg main" | tee /etc/apt/sources.list.d/pgdg.list \ && apt-get update \ @@ -151,12 +151,12 @@ RUN ln -sf /dev/stdout /var/log/apache2/access.log \ && ln -sf /dev/stderr /var/log/apache2/error.log # Configure PosgtreSQL -COPY postgresql.custom.conf.tmpl /etc/postgresql/10/main/ +COPY postgresql.custom.conf.tmpl /etc/postgresql/12/main/ RUN chown -R postgres:postgres /var/lib/postgresql \ - && chown postgres:postgres /etc/postgresql/10/main/postgresql.custom.conf.tmpl \ - && echo "\ninclude 'postgresql.custom.conf'" >> /etc/postgresql/10/main/postgresql.conf -RUN echo "host all all 0.0.0.0/0 md5" >> /etc/postgresql/10/main/pg_hba.conf \ - && echo "host all all ::/0 md5" >> /etc/postgresql/10/main/pg_hba.conf + && chown postgres:postgres /etc/postgresql/12/main/postgresql.custom.conf.tmpl \ + && echo "\ninclude 'postgresql.custom.conf'" >> /etc/postgresql/12/main/postgresql.conf +RUN echo "host all all 0.0.0.0/0 md5" >> /etc/postgresql/12/main/pg_hba.conf \ + && echo "host all all ::/0 md5" >> /etc/postgresql/12/main/pg_hba.conf # copy update scripts COPY openstreetmap-tiles-update-expire /usr/bin/