Skip to content

Commit 0c224eb

Browse files
committed
Upgrade to nginx:1.29, use parallel compilation, correct defaults
1 parent 0e6da86 commit 0c224eb

1 file changed

Lines changed: 7 additions & 5 deletions

File tree

Dockerfile.template

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM nginx:1.27-bookworm-otel AS builder
1+
FROM nginx:1.29-bookworm-otel AS builder
22

33
RUN apt-get update \
44
&& apt-get upgrade -y \
@@ -38,12 +38,14 @@ RUN mkdir -p /app/src \
3838
&& automake --add-missing \
3939
&& autoconf \
4040
&& CXXFLAGS='-O2' CFLAGS='-O2' ./configure --prefix=/app --enable-lz4 \
41-
&& make dist install clean \
41+
&& make dist \
42+
&& make -j $(nproc) \
43+
&& make install clean \
4244
&& mkdir -p /db/diffs /app/etc \
4345
&& cp -r /app/src/rules /app/etc/rules \
4446
&& rm -rf /app/src /app/src.tar.gz
4547

46-
FROM nginx:1.27-bookworm-otel
48+
FROM nginx:1.29-bookworm-otel
4749

4850
RUN apt-get update \
4951
&& apt-get upgrade -y \
@@ -90,8 +92,8 @@ RUN chmod a+rx /app/docker-entrypoint.sh /app/bin/update_overpass.sh /app/bin/ru
9092
/app/bin/oauth_cookie_client.py /app/bin/start_fcgiwarp.sh
9193

9294
ENV OVERPASS_RULES_LOAD=${{OVERPASS_RULES_LOAD:-1}}
93-
ENV OVERPASS_USE_AREAS=${{ENV_OVERPASS_USE_AREAS:-true}}
94-
ENV OVERPASS_ALLOW_DUPLICATE_QUERIES=no
95+
ENV OVERPASS_USE_AREAS=${{OVERPASS_USE_AREAS:-true}}
96+
ENV OVERPASS_ALLOW_DUPLICATE_QUERIES=${{OVERPASS_ALLOW_DUPLICATE_QUERIES:-no}}
9597

9698
EXPOSE 80
9799

0 commit comments

Comments
 (0)