Fix OSX

garminOSXConverter/Dockerfile

@@ -3,6 +3,8 @@ FROM i386/ubuntu:latest
 RUN apt-get update && apt-get install -y p7zip-full curl
 
 WORKDIR /converter/
+
+COPY ./jmc_cli_linux.tar.gz ./jmc_cli_linux.tar.gz
 ADD convert_mac.sh ./
 
 

garminOSXConverter/convert_mac.sh

@@ -1,22 +1,27 @@
 #!/bin/bash
-set -e
+set -euxo pipefail
+
+# curl 'https://www.javawa.nl/downloads/software/jmc_cli_linux.tar.gz?lang=en'  --output jmc_cli_linux.tar.gz \
+#   -H 'authority: www.javawa.nl' \
+#   -H 'accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7' \
+#   -H 'accept-language: en-GB,en;q=0.9,en-US;q=0.8,fi;q=0.7' \
+#   -H 'cache-control: no-cache' \
+#   -H 'content-type: application/x-www-form-urlencoded' \
+#   -H 'origin: https://www.javawa.nl' \
+#   -H 'pragma: no-cache' \
+#   -H 'referer: https://www.javawa.nl/downloads/software/jmc_cli_linux.tar.gz?lang=en' \
+#   -H 'sec-ch-ua: "Google Chrome";v="119", "Chromium";v="119", "Not?A_Brand";v="24"' \
+#   -H 'sec-ch-ua-mobile: ?0' \
+#   -H 'sec-ch-ua-platform: "Windows"' \
+#   -H 'sec-fetch-dest: document' \
+#   -H 'sec-fetch-mode: navigate' \
+#   -H 'sec-fetch-site: same-origin' \
+#   -H 'sec-fetch-user: ?1' \
+#   -H 'upgrade-insecure-requests: 1' \
+#   -H 'user-agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/119.0.0.0 Safari/537.36' \
+#   --data-raw 'download=' \
+#   --compressed
 
-curl 'https://www.javawa.nl/index.php?download=divers/jmc_cli_linux.tar.gz'  --output jmc_cli_linux.tar.gz \
-  -H 'authority: www.javawa.nl' \
-  -H 'cache-control: max-age=0' \
-  -H 'upgrade-insecure-requests: 1' \
-  -H 'origin: https://www.javawa.nl' \
-  -H 'content-type: application/x-www-form-urlencoded' \
-  -H 'user-agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/84.0.4147.89 Safari/537.36' \
-  -H 'accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9' \
-  -H 'sec-fetch-site: same-origin' \
-  -H 'sec-fetch-mode: navigate' \
-  -H 'sec-fetch-user: ?1' \
-  -H 'sec-fetch-dest: document' \
-  -H 'referer: https://www.javawa.nl/index.php?download=divers/jmc_cli_linux.tar.gz' \
-  -H 'accept-language: en-GB,en;q=0.9,en-US;q=0.8,fi;q=0.7' \
-  --data-raw 'download=' \
-  --compressed
 tar -xvzf jmc_cli_linux.tar.gz
 
 rm -rf /output/mtkgarmin_osx

mapcreator/convert_docker.sh

@@ -3,7 +3,7 @@ set -euxo pipefail
 
 printf -v date '%(%Y%m%d)T' -1
 
-docker compose down -v
+docker compose down -v --remove-orphans
 
 docker pull ghcr.io/osgeo/gdal:ubuntu-full-3.6.3
 docker build --tag teemupel/mtk2garmin-ubuntugis-base -f ./ubuntugis-base/Dockerfile ./ubuntugis-base