Skip to content

Commit

Permalink
upgrade Dockerfile Ubuntu 24.04 GDAL 3.9.1 Python 3.12 - 1
Browse files Browse the repository at this point in the history
  • Loading branch information
justb4 committed Aug 8, 2024
1 parent 6e125ff commit 995d957
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,6 @@ jobs:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
repository: nlextract/nlextract
tags: latest,1.5.5
tags: latest,1.5.6dev
# tag_with_ref: true
# tag_with_sha: true
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/osgeo/gdal:ubuntu-small-3.8.5
FROM ghcr.io/osgeo/gdal:ubuntu-small-3.9.1

LABEL maintainer="Just van den Broecke <[email protected]>"

Expand All @@ -19,7 +19,7 @@ ENV TZ=${TIMEZONE} \
RUN \
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' \
&& sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/ noble-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 \
Expand Down
10 changes: 7 additions & 3 deletions VERSIES
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,17 @@ via de link: https://github.com/nlextract/NLExtract/releases.
De nieuwste versie staat bovenaan: kies de "real-release" nlextract zip.
De rest ligt nog open afhankelijk van wensen gebruikers en natuurlijk eventuele bugs.

v1.6.0 - geplend
v1.5.6 - 8 aug 2024

Leftovers van vorige versies. Versie nummer nog te bepalen.
Leftovers van vorige versies.

Zie de Milestone voor deeze versie:
Zie de Milestone voor deze versie:
https://github.com/nlextract/NLExtract/milestone/19

vnl upgrades:
- Stetl submodule,
- Dockerfile: Ubuntu 24.04, Python 3.12, GDAL 3.9.1

v1.5.5 - 25 apr 2024

* Fixes op 1.5.4
Expand Down
2 changes: 1 addition & 1 deletion bagv2/etl/sql/create-meta.sql
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ CREATE TABLE nlx_bag_info (
INSERT INTO nlx_bag_info (sleutel,waarde)
VALUES ('schema_versie', '2.1.0');
INSERT INTO nlx_bag_info (sleutel,waarde)
VALUES ('software_versie', '1.5.5');
VALUES ('software_versie', '1.5.6dev');
INSERT INTO nlx_bag_info (sleutel,waarde)
VALUES ('schema_creatie', to_char(current_timestamp, 'DD-Mon-IYYY HH24:MI:SS'));
INSERT INTO nlx_bag_info (sleutel,waarde)
Expand Down
4 changes: 2 additions & 2 deletions doc/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@
# built documents.
#
# The short X.Y version.
version = '1.5.5'
version = '1.5.6dev'
# The full version, including alpha/beta/rc tags.
release = '1.5.5'
release = '1.5.6dev'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down

0 comments on commit 995d957

Please sign in to comment.