From 4d0bc58db94da9d3d00a9ba01e22ec74a8da2970 Mon Sep 17 00:00:00 2001
From: Linghao Zhang <linghao.zhang@protonmail.com>
Date: Wed, 16 Oct 2024 18:08:50 +0200
Subject: [PATCH] Update version to 4.3.0 and add contour capability

---
 Dockerfile | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 42a6c5f..241a1ec 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,14 @@
 ARG BASE_IMAGE=debian:12-slim
-FROM ${BASE_IMAGE}
+
+FROM ${BASE_IMAGE} AS BASE
+ARG WAHOOMC_VERSION=4.3.0
 
 # Install System Dependencies
 RUN --mount=type=cache,target=/var/cache/apt \
     --mount=type=cache,target=/var/lib/apt \
   DEBIAN_FRONTEND=noninteractive apt-get -qq -y update && \
-  apt-get install -qq -y --no-install-recommends \
+  DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends \
+    curl \
     default-jre \
     osmium-tool \
     osmosis \
@@ -24,7 +27,14 @@ RUN update-alternatives --install /usr/bin/python python /usr/bin/python3 1
 # Install wahoomc
 RUN --mount=type=cache,target=/root/.cache/pip \
   pip install --break-system-packages \
-    wahoomc
+    wahoomc==$WAHOOMC_VERSION
+
+# For contours
+RUN --mount=type=cache,target=/tmp \
+    curl -L http://katze.tfiu.de/projects/phyghtmap/phyghtmap_2.23.orig.tar.gz -o /tmp/phyghtmap_2.tar.gz && \
+    echo "8c0eae73f1d576b0d0177357d026eee30325e1249dedc03f54ebed451cc3b013 /tmp/phyghtmap_2.tar.gz" | sha256sum --check --status && \
+    tar -xzf /tmp/phyghtmap_2.tar.gz -C /tmp && \
+    cd /tmp/phyghtmap-2.23 && python3 setup.py install
 
 # Set up runtime environment
 RUN mkdir -p /app