#379 Dockerfile using GDAL 3.8.4 and Postgres 11 plus BRK tables drop

nlextract · Mar 26, 2024 · 13ad9b5 · 13ad9b5
1 parent 4f07c5a
commit 13ad9b5
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/osgeo/gdal:ubuntu-small-latest
+FROM ghcr.io/osgeo/gdal:ubuntu-small-3.8.4
 
 LABEL maintainer="Just van den Broecke <justb4@gmail.com>"
 
@@ -13,12 +13,14 @@ ENV TZ=${TIMEZONE} \
    APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE="DontWarn"
 
 # https://www.ubuntuupdates.org/ppa/postgresql?dist=focal-pgdg need PG client version 10
+# old: 	curl -fsSL https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - 
+# https://www.ubuntuupdates.org/ppa/postgresql?
 # or use ARGS for other versions
 RUN \
-	apt-get update && apt-get --no-install-recommends install -y gnupg \
-	&& curl -fsSL https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
-	&& sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/ focal-pgdg main" >> /etc/apt/sources.list.d/postgresql.list' \
-	&& apt-get update \
+	apt-get update && apt-get --no-install-recommends install -y gnupg ca-certificates \
+    && curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor | tee /etc/apt/trusted.gpg.d/apt.postgresql.org.gpg >/dev/null \
+	&& sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/ jammy-pgdg main" >> /etc/apt/sources.list.d/postgresql.list' \
+	&& apt-get -y update \
 	&& apt-get --no-install-recommends install -y ${DEB_PACKAGES} \
 	&& cp /usr/share/zoneinfo/${TZ} /etc/localtime \
 	&& dpkg-reconfigure --frontend=noninteractive tzdata

diff --git a/brk/etl/sql/drop-tables.sql b/brk/etl/sql/drop-tables.sql
@@ -3,10 +3,11 @@
 
 SET search_path={schema},public;
 
-DROP TABLE IF EXISTS    pand;
-DROP TABLE IF EXISTS    pand_nummeraanduiding;
-DROP TABLE IF EXISTS    openbareruimtelabel;
-DROP TABLE IF EXISTS    kadastralegrens;
-DROP TABLE IF EXISTS    perceel;
+DROP TABLE IF EXISTS    kwaliteit CASCADE;
+DROP TABLE IF EXISTS    pand CASCADE;
+DROP TABLE IF EXISTS    pand_nummeraanduiding CASCADE;
+DROP TABLE IF EXISTS    openbareruimtelabel CASCADE;
+DROP TABLE IF EXISTS    kadastralegrens CASCADE;
+DROP TABLE IF EXISTS    perceel CASCADE;
 
 SET search_path="$user",public;