Update planet-dump-ng version

Author: Rub21

images/full-history/start.sh

@@ -13,16 +13,16 @@ export VOLUME_DIR=/mnt/data
 export PLANET_EPOCH_DATE="${PLANET_EPOCH_DATE:-2004-01-01}"
 date=$(date '+%y%m%d_%H%M')
 
-local_planetPBFFile=$VOLUME_DIR/planet-history-${date}.osm.pbf
-cloud_planetPBFFile=planet/planet-history-${date}.osm.pbf
+local_planetHistoryPBFFile=$VOLUME_DIR/planet-history-${date}.osm.pbf
+cloud_planetHistoryPBFFile=planet/full-history/planet-history-${date}.osm.pbf
 stateFile="$VOLUME_DIR/state.txt"
 dumpFile="$VOLUME_DIR/input-latest.dump"
 
 
 # If overwrite flag is enabled, use fixed filenames
 if [ "$OVERWRITE_PLANET_FILE" == "true" ]; then
-	local_planetPBFFile=$VOLUME_DIR/planet-history-latest.osm.pbf
-	cloud_planetPBFFile=planet/planet-history-latest.osm.pbf
+	local_planetHistoryPBFFile=$VOLUME_DIR/planet-history-latest.osm.pbf
+	cloud_planetHistoryPBFFile=planet/planet-history-latest.osm.pbf
 fi
 
 # ===============================
@@ -52,13 +52,13 @@ upload_planet_file() {
 
 	if [ "$CLOUDPROVIDER" == "aws" ]; then
 		AWS_URL=${AWS_S3_BUCKET/s3:\/\//http:\/\/}
-		echo "$AWS_URL.s3.amazonaws.com/$cloud_planetPBFFile" > "$stateFile"
-		aws s3 cp "$local_planetPBFFile" "$AWS_S3_BUCKET/$cloud_planetPBFFile" --acl public-read
+		echo "$AWS_URL.s3.amazonaws.com/$cloud_planetHistoryPBFFile" > "$stateFile"
+		aws s3 cp "$local_planetHistoryPBFFile" "$AWS_S3_BUCKET/$cloud_planetHistoryPBFFile" --acl public-read
 		aws s3 cp "$stateFile" "$AWS_S3_BUCKET/planet/state.txt" --acl public-read
 
 	elif [ "$CLOUDPROVIDER" == "gcp" ]; then
-		echo "https://storage.cloud.google.com/$GCP_STORAGE_BUCKET/$cloud_planetPBFFile" > "$stateFile"
-		gsutil cp -a public-read "$local_planetPBFFile" "$GCP_STORAGE_BUCKET/$cloud_planetPBFFile"
+		echo "https://storage.cloud.google.com/$GCP_STORAGE_BUCKET/$cloud_planetHistoryPBFFile" > "$stateFile"
+		gsutil cp -a public-read "$local_planetHistoryPBFFile" "$GCP_STORAGE_BUCKET/$cloud_planetHistoryPBFFile"
 		gsutil cp -a public-read "$stateFile" "$GCP_STORAGE_BUCKET/planet/state.txt"
 	fi
 }
@@ -73,7 +73,7 @@ if [ "$PLANET_EXPORT_METHOD" == "planet-dump-ng" ]; then
 	export PLANET_EPOCH_DATE="$PLANET_EPOCH_DATE"
 	planet-dump-ng \
 		--dump-file "$dumpFile" \
-		--history-pbf "$local_planetPBFFile"
+		--history-pbf "$local_planetHistoryPBFFile"
 
 elif [ "$PLANET_EXPORT_METHOD" == "osmosis" ]; then
 	echo "Generating history planet file with osmosis..."
@@ -87,7 +87,7 @@ elif [ "$PLANET_EXPORT_METHOD" == "osmosis" ]; then
 		readFullHistory=yes \
 		--write-xml-change \
 		compressionMethod=auto \
-		$local_planetPBFFile
+		$local_planetHistoryPBFFile
 else
 	echo "Error: Unknown PLANET_EXPORT_METHOD value. Use 'planet-dump-ng' or 'osmosis'."
 	exit 1

images/osm-processor/Dockerfile

@@ -1,32 +1,11 @@
-FROM debian:bookworm-slim
-ENV workdir /mnt/data
-WORKDIR $workdir
-
-# Installs osmosis v0.48.3, osmium-tool v1.15.0, and PostgreSQL client
-RUN set -ex \
-    && apt-get update \
-    && DEBIAN_FRONTEND=noninteractive apt-get install \
-    -y --no-install-recommends \
-        osmosis \
-        osmium-tool \
-        # Cloud provider CLIs
-        awscli \
-        gsutil \
-        azure-cli \
-        # PostgreSQL client
-        postgresql-client \
-        # Other useful packages
-        rsync \
-        pyosmium \
-        tmux \
-        zsh  \
-        git \
-    && rm -rf /var/lib/apt/lists/*
+# Stage 1: builder
+FROM debian:bookworm-slim AS builder
+WORKDIR /opt/planet-dump-ng
 
-# Install planet-dump-ng
 RUN set -ex \
     && apt-get update \
     && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+        ca-certificates \
         build-essential \
         automake \
         autoconf \
@@ -42,11 +21,39 @@ RUN set -ex \
         libprotobuf-dev \
         pkg-config \
         git \
-    && git clone -b timestamp_epoch https://github.com/OpenHistoricalMap/planet-dump-ng.git /opt/planet-dump-ng \
-    && cd /opt/planet-dump-ng \
+    && git clone -b planet_epoch_date https://github.com/OpenHistoricalMap/planet-dump-ng.git . \
     && ./autogen.sh \
     && ./configure \
     && make \
-    && ln -s /opt/planet-dump-ng/planet-dump-ng /usr/local/bin/planet-dump-ng \
+    && strip planet-dump-ng
+
+FROM debian:bookworm-slim
+ENV workdir /mnt/data
+WORKDIR $workdir
+
+RUN set -ex \
+    && apt-get update \
+    && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+        osmosis \
+        osmium-tool \
+        awscli \
+        gsutil \
+        azure-cli \
+        postgresql-client \
+        rsync \
+        pyosmium \
+        tmux \
+        zsh \
+        git \
+        libxml2 \
+        libboost-filesystem1.74.0 \
+        libboost-program-options1.74.0 \
+        libboost-thread1.74.0 \
+        libboost-iostreams1.74.0 \
+        libboost-date-time1.74.0 \
+        libprotobuf32 \
+        libprotobuf-lite32 \
+        libosmpbf1 \
     && rm -rf /var/lib/apt/lists/*
-    
+
+COPY --from=builder /opt/planet-dump-ng/planet-dump-ng /usr/local/bin/planet-dump-ng