Skip to content

Commit 227a273

Browse files
committed
Update cgimap deploy
1 parent 0364f9e commit 227a273

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

.github/workflows/chartpress.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
branches:
55
- 'main'
66
- 'staging'
7+
- 'cgimap-update'
78
jobs:
89
build:
910
runs-on: ubuntu-22.04

images/cgimap/Dockerfile

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,18 @@ RUN apt-get update -qq && \
1515
WORKDIR /app
1616

1717
# Clone application.
18-
ENV CGIMAP_GITSHA=8ea707e10aeab5698e6859856111816d75354592
18+
ENV CGIMAP_GITSHA=01e33669bfee17d55849d6f731a174b8058ca630
1919
RUN git clone https://github.com/zerebubuth/openstreetmap-cgimap.git /app \
2020
&& git checkout $CGIMAP_GITSHA \
2121
&& sed -i 's#OpenStreetMap and contributors#OpenHistoricalMap is dedicated to the public domain except where otherwise noted.#g' include/cgimap/output_formatter.hpp \
2222
&& sed -i 's#http://www.openstreetmap.org/copyright#https://www.openhistoricalmap.org/copyright#g' include/cgimap/output_formatter.hpp \
2323
&& sed -i 's#http://opendatacommons.org/licenses/odbl/1-0/#https://creativecommons.org/public-domain/cc0/#g' include/cgimap/output_formatter.hpp
2424

25-
# Compile, install and remove source
25+
ARG JOBS=1
26+
ARG BUILD_TESTING=OFF
2627
RUN mkdir build && cd build && \
27-
CXXFLAGS="-flto=auto -ffat-lto-objects -flto=auto -ffat-lto-objects -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2" cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_SHARED_LIBS=OFF -DBUILD_TESTING=ON -DCMAKE_BUILD_TYPE=Release && \
28-
make -j${nproc} && \
29-
ctest --output-on-failure && \
28+
CXXFLAGS="-fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2" cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_SHARED_LIBS=OFF -DBUILD_TESTING=${BUILD_TESTING} -DCMAKE_BUILD_TYPE=Release && \
29+
make -j${JOBS} && \
3030
cmake --build . -t package
3131

3232
FROM debian:bookworm-slim
@@ -43,6 +43,8 @@ RUN groupadd -g 61000 cgimap && \
4343

4444
EXPOSE 8000
4545

46-
COPY ./*.sh .
46+
COPY start.sh liveness.sh /app/
4747

48-
CMD ["/start.sh"]
48+
RUN chmod +x /app/start.sh /app/liveness.sh
49+
50+
CMD ["/app/start.sh"]

0 commit comments

Comments
 (0)