Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ jobs:
matrix:
app:
- name: maps-tile-uploader
- name: maps-tile-server
env:
OUTPUTS_DIR: /tmp/outputs

Expand Down
23 changes: 23 additions & 0 deletions build/docker/Dockerfile.maps-tile-server
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# syntax=docker/dockerfile:1

FROM overv/openstreetmap-tile-server:latest

LABEL org.opencontainers.image.title="Cinode Maps Tile Server"
LABEL org.opencontainers.image.description="OpenStreetMap tile server with jemalloc memory allocator"
LABEL org.opencontainers.image.source="https://github.com/cinode/maps"

# Install jemalloc and clean up
RUN apt-get update && \
apt-get install -y libjemalloc2 && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*

# Create wrapper script for renderd
RUN echo '#!/bin/sh\n\
# Wrapper script for renderd that sets up jemalloc environment\n\
export LD_PRELOAD="/usr/lib/x86_64-linux-gnu/libjemalloc.so.2"\n\
export MALLOC_CONF="background_thread:true,metadata_thp:auto,dirty_decay_ms:5000,muzzy_decay_ms:5000"\n\
\n\
# Execute the original renderd binary\n\
exec /usr/bin/renderd "$@"' > /usr/local/bin/renderd-wrapper && \
chmod +x /usr/local/bin/renderd-wrapper
2 changes: 1 addition & 1 deletion helm/osm-machinery/scripts/tile-server-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ mkdir /run/renderd || true
chown renderer /run/renderd
chown renderer /data/tiles

sudo -u renderer renderd -f -c /etc/renderd.conf
sudo -u renderer /usr/local/bin/renderd-wrapper -f -c /etc/renderd.conf
6 changes: 3 additions & 3 deletions helm/osm-machinery/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,9 @@ tileServer:
resources: {}

image:
registry: docker.io
repository: overv/openstreetmap-tile-server
tag: latest # TODO: Use fixed version
registry: ghcr.io
repository: cinode/maps-tile-server
tag: "0.0.9"

securityContext:
runAsUser: 1000
Expand Down
3 changes: 2 additions & 1 deletion toolbox/release-chart-version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,9 @@ fi

for image in \
maps-tile-uploader \
maps-tile-server \
; do
# Update tile-uploader image tags in values.yaml
# Update image tags in values.yaml
sed -i "/^[[:space:]]*repository\:[[:space:]]*cinode\/${image}/{n;s/^\([[:space:]]*\)tag: .*/\1tag: \"$new_version\"/}" "$VALUES_FILE"
done

Expand Down
Loading