updated login

try with hard coded values
2024-08-13 13:26:33 +02:00 · 2024-08-13 13:26:08 +02:00 · 2024-08-13 13:11:27 +02:00 · 2024-08-13 13:08:31 +02:00 · 2024-08-13 13:02:03 +02:00 · 2024-08-13 12:57:22 +02:00
12 changed files with 248 additions and 194 deletions
--- a/.gitea/workflows/gitea-ci.yaml
+++ b/.gitea/workflows/gitea-ci.yaml
@ -0,0 +1,32 @@
+name: Build docker image
+run-name: ${{ gitea.actor }} is runs ci pipeline
+on: [ push ]
+
+jobs:
+  push:
+    runs-on: ubuntu-latest
+    if: gitea.ref == 'refs/heads/master'
+    steps:
+      - uses: https://github.com/actions/checkout@v4
+      - name: Log in to the Container registry
+        uses: docker/login-action@v2
+        with:
+          registry: git.whimsoc.dev/${{gitea.repository_owner}}/openstreetmap-tile-server
+          username: ${{ gitea.repository_owner }}
+          password: ${{ secrets.PAT }}      
+#      - name: Set up Docker Buildx
+#        uses: docker/setup-buildx-action@v3
+#      - name: Build and push Docker image
+#        uses: https://github.com/docker/build-push-action@v6
+#        with:
+#          context: .
+#          file: ./Dockerfile
+#          push: true
+#          tags: "git.whimsoc.dev/${{gitea.repository_owner}}/openstreetmap-tile-server:${{gitea.sha}},git.whimsoc.dev/${{gitea.repository_owner}}/openstreetmap-tile-server:latest"
+      - name: Build and push
+        run: |
+          TODAY=$(date +'%Y-%m-%d')
+          docker build -t git.whimsoc.dev/${{gitea.repository_owner}}/openstreetmap-tile-server:${TODAY} -t git.whimsoc.dev/${{gitea.repository_owner}}/openstreetmap-tile-server:latest .
+          docker push git.whimsoc.dev/${{gitea.repository_owner}}/openstreetmap-tile-server:${TODAY}
+          docker push git.whimsoc.dev/${{gitea.repository_owner}}/openstreetmap-tile-server:latest          
+  
--- a/.github/workflows/build-and-test.yaml
+++ b/.github/workflows/build-and-test.yaml
@ -5,10 +5,10 @@ on:
    branches:
    - master
    tags:
-    - 'v*'
-  pull_request:
-    branches:
-    - master
+    - 'v[0-9]+.[0-9]+.[0-9]+'
+#  pull_request:
+#    branches:
+#    - master

 # cancel outdated jobs for the same reference
 concurrency:
@ -21,49 +21,65 @@ env:

 jobs:

-  test:
+  build:
+    strategy:
+      matrix:
+        include:
+        - arch    : amd64
+          mode    : build-and-test
+        - arch    : arm64
+          variant : v8
+          mode    : build-only
    runs-on: ubuntu-latest
    env:
      VOLUME    : osm-db
      CONTAINER : osm-www
      MOUNT     : /data/database/
+      PLATFORM  : linux/${{ matrix.arch }}${{ (matrix.variant != '' && format('/{0}', matrix.variant)) || '' }}
    steps:
    -
      name: Checkout
      uses: actions/checkout@v3
    -
      name: Set up QEMU
-      uses: docker/setup-qemu-action@v1
+      uses: docker/setup-qemu-action@v2
+      with:
+        platforms: ${{ matrix.arch }}
    -
      name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v1
+      uses: docker/setup-buildx-action@v2
    -
      name: Environment
      run : |
        echo  IMAGE=$(echo ${{ env.IMAGE }} | tr '[:upper:]' '[:lower:]')  >>$GITHUB_ENV
    -
      name: Docker build
-      uses: docker/build-push-action@v2
+      uses: docker/build-push-action@v3
      with:
        pull       : true
-        load       : true
+        load       : ${{ matrix.mode == 'build-and-test' }}
+        platforms  : ${{ env.PLATFORM }}
        context    : .
        file       : ./Dockerfile
-        tags       : ${{env.IMAGE}}:${{env.TAG}}
-        cache-from : type=gha,scope=${{ github.workflow }}
-        cache-to   : type=gha,scope=${{ github.workflow }},mode=max
+        tags       : ${{ env.IMAGE }}:${{ env.TAG }}
+        cache-from : type=gha,scope=${{ github.workflow }}:${{ env.PLATFORM }}
+        cache-to   : type=gha,scope=${{ github.workflow }}:${{ env.PLATFORM }},mode=max
    -
      name: Import Luxembourg
+      if  : ${{ matrix.mode == 'build-and-test' }}
      run : |
        docker  volume  create  ${VOLUME}
        docker  run  --rm  --shm-size=128M  -v ${VOLUME}:${MOUNT}  -e UPDATES=enabled  ${IMAGE}:${TAG}  import
    -
      name: Start server
+      if  : ${{ matrix.mode == 'build-and-test' }}
      run : |
-        docker  run  --rm  --shm-size=128M  -v ${VOLUME}:${MOUNT}  -e UPDATES=enabled  -p 80:80  -d  --name ${CONTAINER}  ${IMAGE}:${TAG}  run
+        docker  run  --shm-size=128M  -v ${VOLUME}:${MOUNT}  -e UPDATES=enabled  -p 80:80  -d  --name ${CONTAINER}  ${IMAGE}:${TAG}  run
        sleep 30
+        docker  logs  ${CONTAINER}
    -
      name: Download tiles
+      if  : ${{ matrix.mode == 'build-and-test' }}
      run : |
        curl  http://localhost/tile/0/0/0.png            --fail  -o 000.png
        curl  http://localhost/tile/1/0/0.png            --fail  -o 100.png
@ -74,12 +90,14 @@ jobs:
        curl  http://localhost/tile/18/135536/89345.png  --fail  -o example.png
    -
      name: Upload tiles
+      if  : ${{ matrix.mode == 'build-and-test' }}
      uses: actions/upload-artifact@v3
      with:
        name: tiles
        path: '*.png'
    -
      name: Verify tiles
+      if  : ${{ matrix.mode == 'build-and-test' }}
      run : |
        sha1sum  *.png
        sha1sum  --check  <<EOF
@ -100,6 +118,7 @@ jobs:
        done
    -
      name: Cleanup
+      if  : ${{ matrix.mode == 'build-and-test' }}
      run : |
        docker  rm  --force  --volumes  ${CONTAINER}
        docker  volume  rm  --force  ${VOLUME}
@ -108,7 +127,7 @@ jobs:
  deploy:
    runs-on: ubuntu-latest
    needs:
-    - test
+    - build
    if: ${{ github.event_name != 'pull_request' }}
    steps:
    -
@ -122,7 +141,7 @@ jobs:
    -
      name: Docker meta
      id: meta
-      uses: docker/metadata-action@v3
+      uses: docker/metadata-action@v4
      with:
        images: |
          ${{ env.DOCKERHUB_IMAGE }}
@ -134,33 +153,37 @@ jobs:
          type=semver,pattern={{major}}
    -
      name: Set up QEMU
-      uses: docker/setup-qemu-action@v1
+      uses: docker/setup-qemu-action@v2
+      with:
+        platforms: amd64,arm64
    -
      name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v1
+      uses: docker/setup-buildx-action@v2
    -
      name: Login to DockerHub
-      uses: docker/login-action@v1
+      uses: docker/login-action@v2
      if: ${{ env.DOCKERHUB_IMAGE != '' }}
      with:
        username: ${{ secrets.DOCKERHUB_USERNAME }}
        password: ${{ secrets.DOCKERHUB_PASSWORD }}
    -
      name: Login to GHCR
-      uses: docker/login-action@v1
+      uses: docker/login-action@v2
      with:
        registry : ghcr.io
        username : ${{ github.repository_owner }}
        password : ${{ secrets.GITHUB_TOKEN }}
    -
      name: Build and push
-      uses: docker/build-push-action@v2
+      uses: docker/build-push-action@v3
      with:
        pull       : true
        push       : true
+        platforms  : linux/amd64,linux/arm64/v8
        context    : .
        file       : ./Dockerfile
        tags       : ${{ steps.meta.outputs.tags }}
        labels     : ${{ steps.meta.outputs.labels }}
-        cache-from : type=gha,scope=${{ github.workflow }}
-        cache-to   : type=gha,scope=${{ github.workflow }},mode=max
+        cache-from: |
+          type=gha,scope=${{ github.workflow }}:linux/amd64
+          type=gha,scope=${{ github.workflow }}:linux/arm64/v8
--- a/.travis.yml
+++ b/.travis.yml
@ -7,7 +7,6 @@ services:
 before_install:
 - echo "Before install"
 before_script:
- echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
 - docker pull overv/openstreetmap-tile-server || true
 script:
 - docker build --pull --cache-from overv/openstreetmap-tile-server --tag overv/openstreetmap-tile-server .
@ -22,6 +21,7 @@ after_success:
 - if [[ "$TRAVIS_BRANCH" == "master" ]];
  then
  docker images ;
+  echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin ;
  docker push overv/openstreetmap-tile-server ;
  fi
 notifications:
--- a/187
+++ b/187
@ -1,81 +1,17 @@
-FROM ubuntu:20.04 AS compiler-common
+FROM ubuntu:22.04 AS compiler-common
 ENV DEBIAN_FRONTEND=noninteractive
+ENV LANG C.UTF-8
+ENV LC_ALL C.UTF-8

 RUN apt-get update \
 && apt-get install -y --no-install-recommends \
- git-core \
- checkinstall \
- g++ \
- gnupg2 \
- make \
- tar \
- wget \
- ca-certificates \
-&& apt-get update
-
-###########################################################################################################
-
-FROM compiler-common AS compiler-postgis
-RUN echo "deb http://apt.postgresql.org/pub/repos/apt focal-pgdg main" > /etc/apt/sources.list.d/pgdg.list \
+ ca-certificates gnupg lsb-release locales \
+ wget curl \
+ git-core unzip unrar \
+&& locale-gen $LANG && update-locale LANG=$LANG \
+&& sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list' \
 && wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
-&& apt-get update \
-&& apt-get install -y --no-install-recommends \
- postgresql-server-dev-14 \
- libxml2-dev \
- libgeos-dev \
- libproj-dev \
-&& wget https://download.osgeo.org/postgis/source/postgis-3.2.1.tar.gz -O postgis.tar.gz \
-&& mkdir -p postgis_src \
-&& tar -xvzf postgis.tar.gz --strip 1 -C postgis_src \
-&& rm postgis.tar.gz \
-&& cd postgis_src \
-&& ./configure --without-protobuf --without-raster \
-&& make -j $(nproc) \
-&& checkinstall --pkgversion="3.2.1" --install=no --default make install
-
-###########################################################################################################
-
-FROM compiler-common AS compiler-osm2pgsql
-RUN apt-get install -y --no-install-recommends \
- cmake \
- libboost-dev \
- libboost-system-dev \
- libboost-filesystem-dev \
- libexpat1-dev \
- zlib1g-dev \
- libbz2-dev \
- libpq-dev \
- libproj-dev \
- lua5.3 \
- liblua5.3-dev \
- pandoc
-RUN cd ~ \
-&& git clone -b master --single-branch https://github.com/openstreetmap/osm2pgsql.git --depth 1 \
-&& cd osm2pgsql \
-&& mkdir build \
-&& cd build \
-&& cmake .. \
-&& make -j $(nproc) \
-&& checkinstall --pkgversion="1" --install=no --default make install
-
-###########################################################################################################
-
-FROM compiler-common AS compiler-modtile-renderd
-RUN apt-get install -y --no-install-recommends \
- apache2-dev \
- automake \
- autoconf \
- autotools-dev \
- libtool \
- libmapnik-dev
-RUN cd ~ \
-&& git clone -b switch2osm --single-branch https://github.com/SomeoneElseOSM/mod_tile.git --depth 1 \
-&& cd mod_tile \
-&& ./autogen.sh \
-&& ./configure \
-&& make -j $(nproc) \
-&& checkinstall --pkgversion="1" --install=no --pkgname "renderd" --default make install \
-&& checkinstall --pkgversion="1" --install=no --pkgname "mod_tile" --default make install-mod_tile
+&& apt-get update && apt-get -y upgrade

 ###########################################################################################################

@ -83,6 +19,10 @@ FROM compiler-common AS compiler-stylesheet
 RUN cd ~ \
 && git clone --single-branch --branch v5.4.0 https://github.com/gravitystorm/openstreetmap-carto.git --depth 1 \
 && cd openstreetmap-carto \
+&& sed -i 's/, "unifont Medium", "Unifont Upper Medium"//g' style/fonts.mss \
+&& sed -i 's/"Noto Sans Tibetan Regular",//g' style/fonts.mss \
+&& sed -i 's/"Noto Sans Tibetan Bold",//g' style/fonts.mss \
+&& sed -i 's/Noto Sans Syriac Eastern Regular/Noto Sans Syriac Regular/g' style/fonts.mss \
 && rm -rf .git

 ###########################################################################################################
@ -97,13 +37,17 @@ RUN mkdir -p /home/renderer/src \

 ###########################################################################################################

-FROM ubuntu:20.04 AS final
+FROM compiler-common AS final

 # Based on
 # https://switch2osm.org/serving-tiles/manually-building-a-tile-server-18-04-lts/
 ENV DEBIAN_FRONTEND=noninteractive
 ENV AUTOVACUUM=on
 ENV UPDATES=disabled
+ENV REPLICATION_URL=https://planet.openstreetmap.org/replication/hour/
+ENV MAX_INTERVAL_SECONDS=3600
+ENV PG_VERSION 15
+
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone

 # Get packages
@ -111,36 +55,46 @@ RUN apt-get update \
 && apt-get install -y --no-install-recommends \
 apache2 \
 cron \
+ dateutils \
+ fonts-hanazono \
 fonts-noto-cjk \
 fonts-noto-hinted \
 fonts-noto-unhinted \
+ fonts-unifont \
 gnupg2 \
 gdal-bin \
 liblua5.3-dev \
 lua5.3 \
 mapnik-utils \
 npm \
+ osm2pgsql \
 osmium-tool \
 osmosis \
+ postgresql-$PG_VERSION \
+ postgresql-$PG_VERSION-postgis-3 \
+ postgresql-$PG_VERSION-postgis-3-scripts \
+ postgis \
 python-is-python3 \
 python3-mapnik \
 python3-lxml \
 python3-psycopg2 \
 python3-shapely \
 python3-pip \
+ renderd \
 sudo \
- ttf-unifont \
- wget \
-&& echo "deb http://apt.postgresql.org/pub/repos/apt focal-pgdg main" > /etc/apt/sources.list.d/pgdg.list \
-&& wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
-&& apt-get update \
-&& apt-get install -y --no-install-recommends postgresql-14 \
+ vim \
 && apt-get clean autoclean \
 && apt-get autoremove --yes \
 && rm -rf /var/lib/{apt,dpkg,cache,log}/

 RUN adduser --disabled-password --gecos "" renderer

+# Get Noto Emoji Regular font, despite it being deprecated by Google
+RUN wget https://github.com/googlefonts/noto-emoji/blob/9a5261d871451f9b5183c93483cbd68ed916b1e9/fonts/NotoEmoji-Regular.ttf?raw=true --content-disposition -P /usr/share/fonts/
+
+# For some reason this one is missing in the default packages
+RUN wget https://github.com/stamen/terrain-classic/blob/master/fonts/unifont-Medium.ttf?raw=true --content-disposition -P /usr/share/fonts/
+
 # Install python libraries
 RUN pip3 install \
 requests \
@ -148,21 +102,26 @@ RUN pip3 install \
 pyyaml

 # Install carto for stylesheet
-RUN npm install -g carto@0.18.2
+RUN npm install -g carto@1.2.0

 # Configure Apache
-RUN mkdir /var/lib/mod_tile \
-&& chown renderer /var/lib/mod_tile \
-&& mkdir /var/run/renderd \
-&& chown renderer /var/run/renderd \
-&& echo "LoadModule tile_module /usr/lib/apache2/modules/mod_tile.so" >> /etc/apache2/conf-available/mod_tile.conf \
+RUN echo "LoadModule tile_module /usr/lib/apache2/modules/mod_tile.so" >> /etc/apache2/conf-available/mod_tile.conf \
 && echo "LoadModule headers_module /usr/lib/apache2/modules/mod_headers.so" >> /etc/apache2/conf-available/mod_headers.conf \
 && a2enconf mod_tile && a2enconf mod_headers
 COPY apache.conf /etc/apache2/sites-available/000-default.conf
-COPY leaflet-demo.html /var/www/html/index.html
 RUN ln -sf /dev/stdout /var/log/apache2/access.log \
 && ln -sf /dev/stderr /var/log/apache2/error.log

+# leaflet
+COPY leaflet-demo.html /var/www/html/index.html
+RUN cd /var/www/html/ \
+&& wget https://github.com/Leaflet/Leaflet/releases/download/v1.8.0/leaflet.zip \
+&& unzip leaflet.zip \
+&& rm leaflet.zip
+
+# Icon
+RUN wget -O /var/www/html/favicon.ico https://www.openstreetmap.org/favicon.ico
+
 # Copy update scripts
 COPY openstreetmap-tiles-update-expire.sh /usr/bin/
 RUN chmod +x /usr/bin/openstreetmap-tiles-update-expire.sh \
@ -172,50 +131,36 @@ RUN chmod +x /usr/bin/openstreetmap-tiles-update-expire.sh \
 && echo "* * * * *   renderer    openstreetmap-tiles-update-expire.sh\n" >> /etc/crontab

 # Configure PosgtreSQL
-COPY postgresql.custom.conf.tmpl /etc/postgresql/14/main/
+COPY postgresql.custom.conf.tmpl /etc/postgresql/$PG_VERSION/main/
 RUN chown -R postgres:postgres /var/lib/postgresql \
-&& chown postgres:postgres /etc/postgresql/14/main/postgresql.custom.conf.tmpl \
-&& echo "host all all 0.0.0.0/0 md5" >> /etc/postgresql/14/main/pg_hba.conf \
-&& echo "host all all ::/0 md5" >> /etc/postgresql/14/main/pg_hba.conf
+&& chown postgres:postgres /etc/postgresql/$PG_VERSION/main/postgresql.custom.conf.tmpl \
+&& echo "host all all 0.0.0.0/0 scram-sha-256" >> /etc/postgresql/$PG_VERSION/main/pg_hba.conf \
+&& echo "host all all ::/0 scram-sha-256" >> /etc/postgresql/$PG_VERSION/main/pg_hba.conf

 # Create volume directories
-RUN   mkdir  -p  /data/database/  \
+RUN mkdir -p /run/renderd/ \
+  &&  mkdir  -p  /data/database/  \
  &&  mkdir  -p  /data/style/  \
  &&  mkdir  -p  /home/renderer/src/  \
  &&  chown  -R  renderer:  /data/  \
  &&  chown  -R  renderer:  /home/renderer/src/  \
-  &&  mv  /var/lib/postgresql/14/main/  /data/database/postgres/  \
-  &&  mv  /var/lib/mod_tile/            /data/tiles/     \
-  &&  ln  -s  /data/database/postgres  /var/lib/postgresql/14/main             \
+  &&  chown  -R  renderer:  /run/renderd  \
+  &&  mv  /var/lib/postgresql/$PG_VERSION/main/  /data/database/postgres/  \
+  &&  mv  /var/cache/renderd/tiles/            /data/tiles/     \
+  &&  chown  -R  renderer: /data/tiles \
+  &&  ln  -s  /data/database/postgres  /var/lib/postgresql/$PG_VERSION/main             \
  &&  ln  -s  /data/style              /home/renderer/src/openstreetmap-carto  \
-  &&  ln  -s  /data/tiles              /var/lib/mod_tile                       \
+  &&  ln  -s  /data/tiles              /var/cache/renderd/tiles                \
 ;

-# Install PostGIS
-COPY --from=compiler-postgis postgis_src/postgis-src_3.2.1-1_amd64.deb .
-RUN dpkg -i postgis-src_3.2.1-1_amd64.deb \
-&& rm postgis-src_3.2.1-1_amd64.deb
-
-# Install osm2pgsql
-COPY --from=compiler-osm2pgsql /root/osm2pgsql/build/build_1-1_amd64.deb .
-RUN dpkg -i build_1-1_amd64.deb \
-&& rm build_1-1_amd64.deb
-
-# Install renderd
-COPY --from=compiler-modtile-renderd /root/mod_tile/renderd_1-1_amd64.deb .
-RUN dpkg -i renderd_1-1_amd64.deb \
-&& rm renderd_1-1_amd64.deb \
-&& sed -i 's/renderaccount/renderer/g' /usr/local/etc/renderd.conf \
-&& sed -i 's/\/truetype//g' /usr/local/etc/renderd.conf \
-&& sed -i 's/hot/tile/g' /usr/local/etc/renderd.conf
-
-# Install mod_tile
-COPY --from=compiler-modtile-renderd /root/mod_tile/mod-tile_1-1_amd64.deb .
-RUN dpkg -i mod-tile_1-1_amd64.deb \
- && ldconfig \
- && rm mod-tile_1-1_amd64.deb
-
-COPY --from=compiler-modtile-renderd /root/mod_tile/osmosis-db_replag /usr/bin/osmosis-db_replag
+RUN echo '[default] \n\
+URI=/tile/ \n\
+TILEDIR=/var/cache/renderd/tiles \n\
+XML=/home/renderer/src/openstreetmap-carto/mapnik.xml \n\
+HOST=localhost \n\
+TILESIZE=256 \n\
+MAXZOOM=20' >> /etc/renderd.conf \
+ && sed -i 's,/usr/share/fonts/truetype,/usr/share/fonts,g' /etc/renderd.conf

 # Install helper script
 COPY --from=compiler-helper-script /home/renderer/src/regional /home/renderer/src/regional
--- a/README.md
+++ b/README.md
@ -67,10 +67,10 @@ By default the container will use openstreetmap-carto if it is not specified. Ho
 docker run \
    -e DOWNLOAD_PBF=https://download.geofabrik.de/europe/luxembourg-latest.osm.pbf \
    -e DOWNLOAD_POLY=https://download.geofabrik.de/europe/luxembourg.poly \
-    -e NAME_LUA=sample.lua
-    -e NAME_STYLE=test.style
-    -e NAME_MML=project.mml
-    -e NAME_SQL=test.sql
+    -e NAME_LUA=sample.lua \
+    -e NAME_STYLE=test.style \
+    -e NAME_MML=project.mml \
+    -e NAME_SQL=test.sql \
    -v /home/user/openstreetmap-carto-modified:/data/style/ \
    -v osm-data:/data/database/ \
    overv/openstreetmap-tile-server \
@ -126,6 +126,8 @@ Given that you've set up your import as described in the *Automatic updates* sec
 ```
 docker run \
    -p 8080:80 \
+    -e REPLICATION_URL=https://planet.openstreetmap.org/replication/minute/ \
+    -e MAX_INTERVAL_SECONDS=60 \
    -e UPDATES=enabled \
    -v osm-data:/data/database/ \
    -v osm-tiles:/data/tiles/ \
@ -135,6 +137,29 @@ docker run \

 This will enable a background process that automatically downloads changes from the OpenStreetMap server, filters them for the relevant region polygon you specified, updates the database and finally marks the affected tiles for rerendering.

+### Tile expiration (optional)
+
+Specify custom tile expiration settings to control which zoom level tiles are marked as expired when an update is performed. Tiles can be marked as expired in the cache (TOUCHFROM), but will still be served
+until a new tile has been rendered, or deleted from the cache (DELETEFROM), so nothing will be served until a new tile has been rendered.
+
+The example tile expiration values below are the default values.
+
+```
+docker run \
+    -p 8080:80 \
+    -e REPLICATION_URL=https://planet.openstreetmap.org/replication/minute/ \
+    -e MAX_INTERVAL_SECONDS=60 \
+    -e UPDATES=enabled \
+    -e EXPIRY_MINZOOM=13 \
+    -e EXPIRY_TOUCHFROM=13 \
+    -e EXPIRY_DELETEFROM=19 \
+    -e EXPIRY_MAXZOOM=20 \
+    -v osm-data:/data/database/ \
+    -v osm-tiles:/data/tiles/ \
+    -d overv/openstreetmap-tile-server \
+    run
+```
+
 ### Cross-origin resource sharing

 To enable the `Access-Control-Allow-Origin` header to be able to retrieve tiles from other domains, simply set the `ALLOW_CORS` variable to `enabled`:
@ -232,6 +257,8 @@ docker run \
    import
 ```

+Warning: enabling `FLAT_NOTES` together with `UPDATES` only works for entire planet imports (without a `.poly` file).  Otherwise this will break the automatic update script. This is because trimming the differential updates to the specific regions currently isn't supported when using flat nodes.
+
 ### Benchmarks

 You can find an example of the import performance to expect with this image on the [OpenStreetMap wiki](https://wiki.openstreetmap.org/wiki/Osm2pgsql/benchmarks#debian_9_.2F_openstreetmap-tile-server).
@ -242,7 +269,7 @@ You can find an example of the import performance to expect with this image on t

 If you encounter such entries in the log, it will mean that the default shared memory limit (64 MB) is too low for the container and it should be raised:
 ```
-renderd[121]: ERROR: failed to render TILE ajt 2 0-3 0-3
+renderd[121]: ERROR: failed to render TILE default 2 0-3 0-3
 renderd[121]: reason: Postgis Plugin: ERROR: could not resize shared memory segment "/PostgreSQL.790133961" to 12615680 bytes: ### No space left on device
 ```
 To raise it use `--shm-size` parameter. For example:
--- a/apache.conf
+++ b/apache.conf
@ -1,8 +1,9 @@
 <VirtualHost *:80>
    ServerAdmin webmaster@localhost

-    LoadTileConfigFile /usr/local/etc/renderd.conf
-    ModTileRenderdSocketName /var/run/renderd/renderd.sock
+    AddTileConfig /tile/ default
+    LoadTileConfigFile /etc/renderd.conf
+    ModTileRenderdSocketName /run/renderd/renderd.sock
    ModTileRequestTimeout 0
    ModTileMissingRequestTimeout 30

--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@ -0,0 +1,25 @@
+services:
+  map:
+    image: git.whimsoc.dev/hendrik/openstreetmap-tile-server:latest
+    environment:
+      - UPDATES=enabled
+      - MAX_INTERVAL_SECONDS=3600
+      - REPLICATION_URL=https://planet.openstreetmap.org/replication/hour/
+      - THREADS=10
+      - OSM2PGSQL_EXTRA_ARGS=-C 8196
+      - ALLOW_CORS=enabled
+      - TILESIZE=512
+    volumes:
+      - osm-data:/data/database/
+      - osm-tiles:/data/tiles/ 
+      - ./run.sh:/run.sh
+    ports:
+      - "8080:80"
+    command: "run"
+    shm_size: 2g
+
+volumes:
+  osm-tiles:
+    external: true
+  osm-data:
+    external: true
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -1,14 +0,0 @@
-version: '3'
-
-services:
-  map:
-    image: overv/openstreetmap-tile-server
-    volumes:
-      - osm-data:/data/database/
-    ports:
-      - "8080:80"
-    command: "run"
-
-volumes:
-  osm-data:
-    external: true
--- a/leaflet-demo.html
+++ b/leaflet-demo.html
@ -6,8 +6,8 @@
        <meta charset="utf-8" />
        <meta name="viewport" content="width=device-width, initial-scale=1.0">

-        <link rel="stylesheet" href="https://unpkg.com/leaflet@1.7.1/dist/leaflet.css" integrity="sha512-xodZBNTC5n17Xt2atTPuE1HxjVMSvLVW9ocqUKLsCC5CXdbqCmblAshOMAS6/keqq/sMZMZ19scR4PsZChSR7A==" crossorigin="" />
-        <script src="https://unpkg.com/leaflet@1.7.1/dist/leaflet.js" integrity="sha512-XQoYMqMTK8LvdxXYG3nZ448hOEQiglfqkJs1NOQV44cWnUrBc8PkAOcXy20w0vlaXaVUearIOBhiXZ5V3ynxwA==" crossorigin=""></script>
+        <link rel="stylesheet" href="leaflet.css"/>
+        <script src="leaflet.js"></script>

        <style>
            html, body, #map {
--- a/openstreetmap-tiles-update-expire.sh
+++ b/openstreetmap-tiles-update-expire.sh
@ -3,7 +3,7 @@
 set -e

 #------------------------------------------------------------------------------
-# AJT - change directory to mod_tile directory so that we can run replag
+# Change directory to mod_tile directory so that we can run replag
 # and other things directly from this script when run from cron.
 # Change the actual location to wherever installed locally.
 #------------------------------------------------------------------------------
@ -56,10 +56,10 @@ RUNLOG=$LOG_DIR/run.log
 # Here we expire (but don't immediately rerender) tiles between zoom levels
 # 13 and 18 and delete between 19 and 20.
 #------------------------------------------------------------------------------
-EXPIRY_MINZOOM=13
-EXPIRY_TOUCHFROM=13
-EXPIRY_DELETEFROM=19
-EXPIRY_MAXZOOM=20
+EXPIRY_MINZOOM=${EXPIRY_MINZOOM:="13"}
+EXPIRY_TOUCHFROM=${EXPIRY_TOUCHFROM:="13"}
+EXPIRY_DELETEFROM=${EXPIRY_DELETEFROM:="19"}
+EXPIRY_MAXZOOM=${EXPIRY_MAXZOOM:="20"}

 #*************************************************************************
 #*************************************************************************
@ -109,14 +109,16 @@ freelock()
 if [ $# -eq 1 ] ; then
    m_info "Initialising Osmosis replication system to $1"
    mkdir -p $WORKOSM_DIR
+    $OSMOSIS_BIN -v 5 --read-replication-interval-init workingDirectory=$WORKOSM_DIR 1>&2 2> "$OSMOSISLOG"

-    $OSMOSIS_BIN --read-replication-interval-init workingDirectory=$WORKOSM_DIR 1>&2 2> "$OSMOSISLOG"
+    init_seq=$(/usr/lib/python3-pyosmium/pyosmium-get-changes --server $REPLICATION_URL -D $1)
+    url_dynamicPart=$(printf %09d $init_seq | sed 's_\([0-9][0-9][0-9]\)\([0-9][0-9][0-9]\)\([0-9][0-9][0-9]\)_\1/\2/\3_')
+    wget $REPLICATION_URL/$url_dynamicPart.state.txt -O $WORKOSM_DIR/state.txt

-    wget "https://replicate-sequences.osm.mazdermind.de/?"$1"T00:00:00Z" -O $WORKOSM_DIR/state.txt
-
-    mv $WORKOSM_DIR/configuration.txt $WORKOSM_DIR/configuration_orig.txt
-    sed "s!baseUrl=http://planet.openstreetmap.org/replication/minute!baseUrl=https://planet.openstreetmap.org/replication/minute!" $WORKOSM_DIR/configuration_orig.txt > $WORKOSM_DIR/configuration.txt
-    exit 0
+    cat > $WORKOSM_DIR/configuration.txt <<- EOM
+baseUrl=$REPLICATION_URL
+maxInterval=$MAX_INTERVAL_SECONDS
+EOM
 fi

 # make sure the lockfile is removed when we exit and then claim it
@ -141,8 +143,9 @@ if `python -c "import os, sys; st=os.statvfs('$BASE_DIR'); sys.exit(1 if st.f_ba
 fi

 seq=`cat $WORKOSM_DIR/state.txt | grep sequenceNumber | cut -d= -f2`
+replag=`dateutils.ddiff $(cat $WORKOSM_DIR/state.txt | grep timestamp | cut -d "=" -f 2 | sed 's,\\\,,g') now`

-m_ok "start import from seq-nr $seq, replag is `osmosis-db_replag -h`"
+m_ok "start import from seq-nr $seq, replag is $replag"

 /bin/cp $WORKOSM_DIR/state.txt $WORKOSM_DIR/last.state.txt
 m_ok "downloading diff"
@ -182,15 +185,13 @@ fi
 m_ok "expiring tiles"

 #------------------------------------------------------------------------------
-# When expiring tiles we need to define the style sheet if it's not "default".
-# In this case it's "ajt".
 # Previously all tiles on the "dirty" list between $EXPIRY_MINZOOM and
 # $EXPIRY_MAXZOOM were dirtied.  We currently re-render
 # tiles >= $EXPIRY_MINZOOM and < $EXPIRY_DELETEFROM, expiry from 14 and
 # delete >= $EXPIRY_DELETEFROM and <= $EXPIRY_MAXZOOM.
 # The default path to renderd.sock is fixed.
 #------------------------------------------------------------------------------
-if ! render_expired --map=ajt --min-zoom=$EXPIRY_MINZOOM --touch-from=$EXPIRY_TOUCHFROM --delete-from=$EXPIRY_DELETEFROM --max-zoom=$EXPIRY_MAXZOOM -s /var/run/renderd/renderd.sock < "$EXPIRY_FILE.$$" 2>&1 | tail -8 >> "$EXPIRYLOG"; then
+if ! render_expired --map=default --min-zoom=$EXPIRY_MINZOOM --touch-from=$EXPIRY_TOUCHFROM --delete-from=$EXPIRY_DELETEFROM --max-zoom=$EXPIRY_MAXZOOM -s /run/renderd/renderd.sock < "$EXPIRY_FILE.$$" 2>&1 | tail -8 >> "$EXPIRYLOG"; then
    m_info "Expiry failed"
 fi

--- a/postgresql.custom.conf.tmpl
+++ b/postgresql.custom.conf.tmpl
@ -1,7 +1,7 @@
 # Suggested minimal settings from
 # https://ircama.github.io/osm-carto-tutorials/tile-server-ubuntu/

-shared_buffers = 128MB
+shared_buffers = 1GB
 min_wal_size = 1GB
 # max_wal_size = 2GB # Overridden below
 maintenance_work_mem = 256MB
@ -16,10 +16,14 @@ wal_buffers = 1024kB
 wal_writer_delay = 500ms
 commit_delay = 10000
 # checkpoint_segments = 60 # unrecognized in psql 10.7.1
-max_wal_size = 2880MB
+max_wal_size = 5GB
 random_page_cost = 1.1
 track_activity_query_size = 16384
 autovacuum_vacuum_scale_factor = 0.05
 autovacuum_analyze_scale_factor = 0.02

+checkpoint_timeout = 60min
+wal_level = minimal
+max_wal_senders = 0
+
 listen_addresses = '*'
--- a/run.sh
+++ b/run.sh
@ -3,9 +3,9 @@
 set -euo pipefail

 function createPostgresConfig() {
-  cp /etc/postgresql/14/main/postgresql.custom.conf.tmpl /etc/postgresql/14/main/conf.d/postgresql.custom.conf
-  sudo -u postgres echo "autovacuum = $AUTOVACUUM" >> /etc/postgresql/14/main/conf.d/postgresql.custom.conf
-  cat /etc/postgresql/14/main/conf.d/postgresql.custom.conf
+  cp /etc/postgresql/$PG_VERSION/main/postgresql.custom.conf.tmpl /etc/postgresql/$PG_VERSION/main/conf.d/postgresql.custom.conf
+  sudo -u postgres echo "autovacuum = $AUTOVACUUM" >> /etc/postgresql/$PG_VERSION/main/conf.d/postgresql.custom.conf
+  cat /etc/postgresql/$PG_VERSION/main/conf.d/postgresql.custom.conf
 }

 function setPostgresPassword() {
@ -42,9 +42,11 @@ fi

 if [ "$1" == "import" ]; then
    # Ensure that database directory is in right state
+    mkdir -p /data/database/postgres/
+    chown renderer: /data/database/
    chown -R postgres: /var/lib/postgresql /data/database/postgres/
    if [ ! -f /data/database/postgres/PG_VERSION ]; then
-        sudo -u postgres /usr/lib/postgresql/14/bin/pg_ctl -D /data/database/postgres/ initdb -o "--locale C.UTF-8"
+        sudo -u postgres /usr/lib/postgresql/$PG_VERSION/bin/pg_ctl -D /data/database/postgres/ initdb -o "--locale C.UTF-8"
    fi

    # Initialize PostgreSQL
@ -68,7 +70,7 @@ if [ "$1" == "import" ]; then
    if [ -n "${DOWNLOAD_PBF:-}" ]; then
        echo "INFO: Download PBF file: $DOWNLOAD_PBF"
        wget ${WGET_ARGS:-} "$DOWNLOAD_PBF" -O /data/region.osm.pbf
-        if [ -n "$DOWNLOAD_POLY" ]; then
+        if [ -n "${DOWNLOAD_POLY:-}" ]; then
            echo "INFO: Download PBF-POLY file: $DOWNLOAD_POLY"
            wget ${WGET_ARGS:-} "$DOWNLOAD_POLY" -O /data/region.poly
        fi
@ -76,10 +78,10 @@ if [ "$1" == "import" ]; then

    if [ "${UPDATES:-}" == "enabled" ] || [ "${UPDATES:-}" == "1" ]; then
        # determine and set osmosis_replication_timestamp (for consecutive updates)
-        REPLICATION_TIMESTAMP=`osmium fileinfo /data/region.osm.pbf | grep 'osmosis_replication_timestamp=' | cut -b35-44`
+        REPLICATION_TIMESTAMP=`osmium fileinfo -g header.option.osmosis_replication_timestamp /data/region.osm.pbf`

        # initial setup of osmosis workspace (for consecutive updates)
-        sudo -u renderer openstreetmap-tiles-update-expire.sh $REPLICATION_TIMESTAMP
+        sudo -E -u renderer openstreetmap-tiles-update-expire.sh $REPLICATION_TIMESTAMP
    fi

    # copy polygon file if available
@ -166,11 +168,17 @@ if [ "$1" == "run" ]; then
    setPostgresPassword

    # Configure renderd threads
-    sed -i -E "s/num_threads=[0-9]+/num_threads=${THREADS:-4}/g" /usr/local/etc/renderd.conf
+    sed -i -E "s/num_threads=[0-9]+/num_threads=${THREADS:-4}/g" /etc/renderd.conf
+    sed -i -E "s/TILESIZE=[0-9]+/TILESIZE=${TILESIZE:-256}/g" /etc/renderd.conf

    # start cron job to trigger consecutive updates
    if [ "${UPDATES:-}" == "enabled" ] || [ "${UPDATES:-}" == "1" ]; then
        /etc/init.d/cron start
+        sudo -u renderer touch /var/log/tiles/run.log; tail -f /var/log/tiles/run.log >> /proc/1/fd/1 &
+        sudo -u renderer touch /var/log/tiles/osmosis.log; tail -f /var/log/tiles/osmosis.log >> /proc/1/fd/1 &
+        sudo -u renderer touch /var/log/tiles/expiry.log; tail -f /var/log/tiles/expiry.log >> /proc/1/fd/1 &
+        sudo -u renderer touch /var/log/tiles/osm2pgsql.log; tail -f /var/log/tiles/osm2pgsql.log >> /proc/1/fd/1 &
+
    fi

    # Run while handling docker stop's SIGTERM
@ -179,7 +187,7 @@ if [ "$1" == "run" ]; then
    }
    trap stop_handler SIGTERM

-    sudo -u renderer renderd -f -c /usr/local/etc/renderd.conf &
+    sudo -u renderer renderd -f -c /etc/renderd.conf &
    child=$!
    wait "$child"

@ -190,3 +198,5 @@ fi

 echo "invalid command"
 exit 1
+
+
Author	SHA1	Message	Date
Hendrik Behme	24170a794a	updated login All checks were successful Build docker image / push (push) Successful in 50s Details	2024-08-13 13:26:33 +02:00
Hendrik Behme	e57fde375c	updated login Some checks failed Build docker image / push (push) Has been cancelled Details	2024-08-13 13:26:08 +02:00
Hendrik Behme	016e08d658	try with hard coded values Some checks failed Build docker image / push (push) Failing after 6s Details	2024-08-13 13:11:27 +02:00
Hendrik Behme	830305d03e	next try Some checks failed Build docker image / push (push) Failing after 5s Details	2024-08-13 13:08:31 +02:00
Hendrik Behme	28e5de0d23	updated vars Some checks failed Build docker image / push (push) Failing after 6s Details	2024-08-13 13:02:03 +02:00
Hendrik Behme	588e6db76a	corrected syntax Some checks failed Build docker image / push (push) Failing after 5s Details	2024-08-13 12:57:22 +02:00
Hendrik Behme	89f1ecadbc	remved comment	2024-08-13 12:56:17 +02:00
Hendrik Behme	99893aea87	replaced build action	2024-08-13 12:49:35 +02:00
Hendrik Behme	8d3dfc24bc	removed some weird? lines from config Some checks failed Build docker image / push (push) Failing after 2m30s Details	2024-08-13 10:42:43 +02:00
Hendrik Behme	f766278f37	updated dest reg Some checks failed Build docker image / push (push) Failing after 2m36s Details	2024-08-08 02:17:29 +02:00
Hendrik Behme	2664fc4a11	added login Some checks failed Build docker image / push (push) Failing after 2m34s Details	2024-08-08 02:10:33 +02:00
Hendrik Behme	e30cde2a0b	removed blocking attriubute Some checks failed Build docker image / push (push) Failing after 3m22s Details	2024-08-08 01:47:52 +02:00
Hendrik Behme	a9956c194b	updated git workflows Some checks are pending Build docker image / push (push) Blocked by required conditions Details	2024-08-08 01:43:29 +02:00
Hendrik Behme	9ec73992db	removed old docker file and added gitea runner	2024-08-08 01:34:29 +02:00
Hendrik	8982d7d3da	added postgres improvments and some general optimisations	2024-08-07 23:48:22 +02:00
Kai Liebscher	6088b9b37f	upgrade carto from v0.18.2 to v1.2.0 (#355 ) (#359 ) Co-authored-by: Kai Liebscher <kliebscher@micromata.de>	2023-06-25 12:34:51 +02:00
Curtis Yung	61270b8bff	Add support to PostgreSQL 15 (#356 ) * Update Dockerfile add support to PostgreSQL 15 and alter encryption method to scram-sha-256 instead of md5 * Update run.sh add support to PostgreSQL 15	2023-03-18 21:45:25 +01:00
galewis2	f6a6ad846a	Fix path for consistency (#314 )	2023-03-18 21:14:32 +01:00
Stepan	e144c4873b	readme give possibility to copy/paste command into linux terminal (#368 )	2023-03-18 21:10:32 +01:00
Robin C. Ladiges	10571b77b7	validate version tags (#308 ) so non-semver tags don't trigger a deployment that will fail. It's not a normal regexp syntax. Dots `.` will only match dots and not any characters.	2022-09-27 10:04:05 -04:00
Mikael Wikstrom	a814c0306a	upgrade leaflet from v1.7.1 to v1.8.0 (#315 ) Leaflet 1.8.0 Stable version, released on April 18, 2022. Leaflet 1.7.1 Previous stable version, released on September 3, 2020. install leaflet localy so server works offline Co-authored-by: galewis2 <62433564+galewis2@users.noreply.github.com>	2022-09-27 10:03:13 -04:00
Mikael Wikstrom	fdacfe78ef	Add favicon.ico (#316 )	2022-09-27 10:00:44 -04:00
galewis2	54624a969e	Update Dockerfile (#307 )	2022-08-03 23:40:03 +02:00
balchen	005fe6968f	Added new environment variables for tile expiration to README.md (#299 )	2022-07-26 23:10:49 +02:00
galewis2	25a661e3da	Actually allow modifying the replication URL (#297 )	2022-07-22 09:18:24 -04:00
balchen	67d127b201	Use tile expiration settings from env if set, or default values as be… (#296 ) * Use tile expiration settings from env if set, or default values as before. * Update openstreetmap-tiles-update-expire.sh Co-authored-by: galewis2 <62433564+galewis2@users.noreply.github.com>	2022-07-22 13:33:07 +02:00
Robin C. Ladiges	afd62f33a0	multiarch build for additional linux/arm64/v8 support (#292 ) * multiarch build for additional linux/arm64/v8 and linux/arm/v7 support This commit fixes issue #291 * print logs of run command * drop arm/v7 for now (untested) * build arm64/v8 parallel during the build stage (without testing the image)	2022-07-19 08:59:17 +02:00
galewis2	21b409863e	Simplify parsing of timestamp (#294 )	2022-07-15 08:19:46 -04:00
galewis2	81c3433055	Reduce dependencies for updates, switch to Ubuntu 22.04 (#234 )	2022-07-05 08:23:15 -04:00
Robin C. Ladiges	dc47871a5d	warn about FLAT_NODES w/ UPDATES incompatibility (#282 ) See https://github.com/Zverik/regional/issues/17	2022-05-25 22:21:56 +02:00
Robin C. Ladiges	5572c9722e	create /data/database/postgres/ if missing (#273 ) fix for issue #271	2022-05-02 00:43:17 +02:00