update to debian trixie; postgres 18; fix cron; use tcmalloc
This commit is contained in:
11
Dockerfile
11
Dockerfile
@@ -1,4 +1,4 @@
|
||||
FROM ubuntu:24.04@sha256:7c06e91f61fa88c08cc74f7e1b7c69ae24910d745357e0dfe1d2c0322aaf20f9 AS compiler-common
|
||||
FROM debian:trixie AS compiler-common
|
||||
ENV DEBIAN_FRONTEND=noninteractive
|
||||
ENV LANG=C.UTF-8
|
||||
ENV LC_ALL=C.UTF-8
|
||||
@@ -8,9 +8,9 @@ RUN apt-get update \
|
||||
&& apt-get install -y --no-install-recommends \
|
||||
ca-certificates gnupg lsb-release locales \
|
||||
wget curl \
|
||||
git-core unzip unrar postgresql-common \
|
||||
git-core unzip unrar-free postgresql-common \
|
||||
&& locale-gen $LANG && update-locale LANG=$LANG \
|
||||
&& /usr/share/postgresql-common/pgdg/apt.postgresql.org.sh -i -v 17\
|
||||
&& /usr/share/postgresql-common/pgdg/apt.postgresql.org.sh -i -v 18 \
|
||||
&& apt-get update && apt-get -y upgrade\
|
||||
&& apt-get clean \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
@@ -49,7 +49,7 @@ ENV AUTOVACUUM=on
|
||||
ENV UPDATES=disabled
|
||||
ENV REPLICATION_URL=https://planet.openstreetmap.org/replication/hour/
|
||||
ENV MAX_INTERVAL_SECONDS=3600
|
||||
ENV PG_VERSION=17
|
||||
ENV PG_VERSION=18
|
||||
|
||||
RUN ln -snf "/usr/share/zoneinfo/$TZ" /etc/localtime && echo "$TZ" > /etc/timezone
|
||||
|
||||
@@ -84,6 +84,7 @@ RUN apt-get update \
|
||||
python3-shapely \
|
||||
python3-pip \
|
||||
renderd \
|
||||
libgoogle-perftools4 \
|
||||
sudo \
|
||||
vim \
|
||||
pipx \
|
||||
@@ -136,7 +137,7 @@ RUN chmod +x /usr/bin/openstreetmap-tiles-update-expire.sh \
|
||||
&& mkdir /var/log/tiles \
|
||||
&& chmod a+rw /var/log/tiles \
|
||||
&& ln -s /home/renderer/src/mod_tile/osmosis-db_replag /usr/bin/osmosis-db_replag \
|
||||
&& echo "* * * * * renderer openstreetmap-tiles-update-expire.sh\n" >> /etc/crontab
|
||||
&& echo "* * * * * renderer openstreetmap-tiles-update-expire.sh" >> /etc/crontab
|
||||
|
||||
# Configure PosgtreSQL
|
||||
COPY postgresql.custom.conf.tmpl /etc/postgresql/$PG_VERSION/main/
|
||||
|
||||
Reference in New Issue
Block a user