Skip to content

Commit d116482

Browse files
authored
Merge pull request #133 from OpenSPP/fix/geoip-checksum
fix: add SHA-256 checksum verification for geoipupdate deb package
2 parents 66c1264 + 79c4961 commit d116482

File tree

1 file changed

+13
-2
lines changed

1 file changed

+13
-2
lines changed

docker/Dockerfile

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,8 @@ ARG WKHTMLTOPDF_VERSION=0.12.6.1
129129
ARG WKHTMLTOPDF_AMD64_CHECKSUM='98ba0d157b50d36f23bd0dedf4c0aa28c7b0c50fcdcdc54aa5b6bbba81a3941d'
130130
ARG WKHTMLTOPDF_ARM64_CHECKSUM='b6606157b27c13e044d0abbe670301f88de4e1782afca4f9c06a5817f3e03a9c'
131131
ARG GEOIP_UPDATER_VERSION=6.0.0
132+
ARG GEOIP_AMD64_CHECKSUM='ccbd3f99618c8b8858a284a122e93c1c287a00cada3f818921b47cf9a43403fb'
133+
ARG GEOIP_ARM64_CHECKSUM='a2f985db417e9f13288725710e63280a0331536510b01e6b94f8b852fba8c2b3'
132134
ARG ODOO_VERSION=19.0
133135
ARG UID=1000
134136
ARG GID=1000
@@ -216,11 +218,20 @@ RUN --mount=type=cache,target=/tmp/downloads,sharing=locked \
216218
fi; \
217219
apt-get install -y --no-install-recommends "$WKHTMLTOPDF_DEB"; \
218220
# geoipupdate
219-
GEOIP_DEB="/tmp/downloads/geoipupdate_${GEOIP_UPDATER_VERSION}_${TARGETARCH}.deb"; \
220-
if [ ! -f "$GEOIP_DEB" ] || ! dpkg --info "$GEOIP_DEB" >/dev/null 2>&1; then \
221+
if [ "$TARGETARCH" = "arm64" ]; then \
222+
GEOIP_CHECKSUM=$GEOIP_ARM64_CHECKSUM; \
223+
elif [ "$TARGETARCH" = "amd64" ]; then \
224+
GEOIP_CHECKSUM=$GEOIP_AMD64_CHECKSUM; \
225+
else \
226+
echo "Unsupported architecture: $TARGETARCH" >&2; \
227+
exit 1; \
228+
fi; \
229+
GEOIP_DEB="/tmp/downloads/geoipupdate_${GEOIP_UPDATER_VERSION}_linux_${TARGETARCH}.deb"; \
230+
if [ ! -f "$GEOIP_DEB" ] || ! echo "${GEOIP_CHECKSUM} ${GEOIP_DEB}" | sha256sum -c - >/dev/null 2>&1; then \
221231
rm -f "$GEOIP_DEB"; \
222232
curl -sSL -o "$GEOIP_DEB" \
223233
"https://github.com/maxmind/geoipupdate/releases/download/v${GEOIP_UPDATER_VERSION}/geoipupdate_${GEOIP_UPDATER_VERSION}_linux_${TARGETARCH}.deb"; \
234+
echo "${GEOIP_CHECKSUM} ${GEOIP_DEB}" | sha256sum -c -; \
224235
fi; \
225236
dpkg -i "$GEOIP_DEB"
226237

0 commit comments

Comments
 (0)