Merge branch 'kartoza-develop' into develop

ftt01 · May 8, 2024 · bf5ff4b · bf5ff4b
2 parents 7e6c0e3 + 3eb02eb
commit bf5ff4b
Show file tree

Hide file tree

Showing 48 changed files with 1,757 additions and 902 deletions.
diff --git a/.example.env b/.example.env
@@ -4,7 +4,7 @@ COMPOSE_PROJECT_NAME=postgis
 
 ## For build arguments
 DISTRO=debian
-IMAGE_VERSION=bullseye
+IMAGE_VERSION=bookworm
 IMAGE_VARIANT=slim
 # Set GENERATE_ALL_LOCALE to empty value or 0 to build just default LOCALE: en_US.UTF-8
 GENERATE_ALL_LOCALE=1
@@ -13,7 +13,8 @@ LANG=en_US.UTF-8
 # locale filter to include in the locale generator
 LANGS="en_US.UTF-8,id_ID.UTF-8"
 
-POSTGRES_MAJOR_VERSION=15
+POSTGRES_MAJOR_VERSION=16
 POSTGIS_MAJOR_VERSION=3
-POSTGIS_MINOR_RELEASE=3
-BUILD_TIMESCALE=false
+POSTGIS_MINOR_RELEASE=4
+BUILD_TIMESCALE=false
+TIMESCALE_VERSION=2-2.14.2
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,6 @@
+version: 2
+updates:
+ - package-ecosystem: "github-actions"
+ directory: "/"
+ schedule:
+ interval: "monthly"
diff --git a/.github/workflows/build-latest.yaml b/.github/workflows/build-latest.yaml
@@ -1,19 +1,5 @@
 name: build-latest
 on:
-# workflow_dispatch:
-# inputs:
-# distro:
-# description: Base image distro
-# required: true
-# default: debian
-# imageVersion:
-# description: Base distro image version/release
-# required: true
-# default: bullseye
-# imageVariant:
-# description: Base image variant
-# required: true
-# default: slim
  workflow_dispatch:
  pull_request:
  branches:
@@ -27,46 +13,47 @@ jobs:
  strategy:
  matrix:
  postgresMajorVersion:
- - 15
+ - 16
  postgisMajorVersion:
  - 3
  postgisMinorRelease:
- - 3
+ - 4
+ imageVersion:
+ - imageDistro: debian
+ imageDistroVersion: bookworm
+ imageDistroVariant: slim
  scenario:
  - datadir_init
  - streaming_replication
  - collations
  - extensions
  - logical_replication
  - init_scripts
- include:
- - distro: debian
- imageVersion: bullseye
- imageVariant: slim
+ - multiple_databases
  steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
  - name: Set up QEMU
- uses: docker/setup-qemu-action@v2
+ uses: docker/setup-qemu-action@v3
  - name: Set up Docker Buildx
- uses: docker/setup-buildx-action@v2
+ uses: docker/setup-buildx-action@v3
  - name: Build image for testing
  id: docker_build_testing_image
- uses: docker/build-push-action@v3
+ uses: docker/build-push-action@v5
  with:
  context: .
  file: Dockerfile
  push: false
  load: true
  tags: kartoza/postgis:manual-build
  build-args: |
- DISTRO=${{ matrix.distro }}
- IMAGE_VERSION=${{ matrix.imageVersion }}
- IMAGE_VARIANT=${{ matrix.imageVariant }}
+ DISTRO=${{ matrix.imageVersion.imageDistro }}
+ IMAGE_VERSION=${{ matrix.imageVersion.imageDistroVersion }}
+ IMAGE_VARIANT=${{ matrix.imageVersion.imageDistroVariant }}
  LANGS=en_US.UTF-8,id_ID.UTF-8
  GENERATE_ALL_LOCALE=0
  POSTGRES_MAJOR_VERSION=${{ matrix.postgresMajorVersion }}
  POSTGIS_MAJOR_VERSION=${{ matrix.postgisMajorVersion }}
- POSTGIS_MINOR_VERSION=${{ matrix.postgresMinorVersion }}
+ POSTGIS_MINOR_VERSION=${{ matrix.postgisMinorRelease }}
  cache-from: |
  type=gha,scope=test
  type=gha,scope=prod
@@ -89,29 +76,29 @@ jobs:
  strategy:
  matrix:
  postgresMajorVersion:
- - 15
+ - 16
  postgisMajorVersion:
  - 3
  postgisMinorRelease:
- - 3
- include:
- - distro: debian
- imageVersion: bullseye
- imageVariant: slim
+ - 4
+ imageVersion:
+ - imageDistro: debian
+ imageDistroVersion: bookworm
+ imageDistroVariant: slim
  steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
  - name: Set up QEMU
- uses: docker/setup-qemu-action@v2
+ uses: docker/setup-qemu-action@v3
  - name: Set up Docker Buildx
- uses: docker/setup-buildx-action@v2
+ uses: docker/setup-buildx-action@v3
  - name: Login to DockerHub
- uses: docker/login-action@v2
+ uses: docker/login-action@v3
  with:
  username: ${{ secrets.DOCKERHUB_USERNAME }}
  password: ${{ secrets.DOCKERHUB_PASSWORD }}
  - name: Docker meta
  id: docker_meta
- uses: docker/metadata-action@v3
+ uses: docker/metadata-action@v5
  with:
  images: ${{ secrets.DOCKERHUB_REPO}}/postgis
  tags: |
@@ -121,22 +108,22 @@ jobs:
 
  - name: Build image for testing
  id: docker_build_testing_image
- uses: docker/build-push-action@v3
+ uses: docker/build-push-action@v5
  with:
  context: .
  file: Dockerfile
  push: true
  tags: |
  ${{ steps.docker_meta.outputs.tags }}-${{ matrix.postgresMajorVersion }}-${{ matrix.postgisMajorVersion }}.${{ matrix.postgisMinorRelease }}
  build-args: |
- DISTRO=${{ matrix.distro }}
- IMAGE_VERSION=${{ matrix.imageVersion }}
- IMAGE_VARIANT=${{ matrix.imageVariant }}
+ DISTRO=${{ matrix.imageVersion.imageDistro }}
+ IMAGE_VERSION=${{ matrix.imageVersion.imageDistroVersion }}
+ IMAGE_VARIANT=${{ matrix.imageVersion.imageDistroVariant }}
  LANGS=en_US.UTF-8,id_ID.UTF-8
  GENERATE_ALL_LOCALE=0
  POSTGRES_MAJOR_VERSION=${{ matrix.postgresMajorVersion }}
  POSTGIS_MAJOR_VERSION=${{ matrix.postgisMajorVersion }}
- POSTGIS_MINOR_VERSION=${{ matrix.postgresMinorVersion }}
+ POSTGIS_MINOR_VERSION=${{ matrix.postgisMinorRelease }}
  cache-from: |
  type=gha,scope=test
  type=gha,scope=prod

diff --git a/.github/workflows/deploy-image.yaml b/.github/workflows/deploy-image.yaml
@@ -1,19 +1,6 @@
 name: deploy-image
 on:
  workflow_dispatch:
-# inputs:
-# distro:
-# description: Base image distro
-# required: true
-# default: debian
-# imageVersion:
-# description: Base distro image version/release
-# required: true
-# default: bullseye
-# imageVariant:
-# description: Base image variant
-# required: true
-# default: slim
  workflow_run:
  workflows:
  - build-latest
@@ -29,24 +16,24 @@ jobs:
  strategy:
  matrix:
  postgresMajorVersion:
- - 15
+ - 16
  postgisMajorVersion:
  - 3
  postgisMinorRelease:
- - 3
- include:
- - distro: debian
- imageVersion: bullseye
- imageVariant: slim
+ - 4
+ imageVersion:
+ - imageDistro: debian
+ imageDistroVersion: bookworm
+ imageDistroVariant: slim
  steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
  - name: Set up QEMU
- uses: docker/setup-qemu-action@v2
+ uses: docker/setup-qemu-action@v3
  - name: Set up Docker Buildx
- uses: docker/setup-buildx-action@v2
+ uses: docker/setup-buildx-action@v3
 
  - name: Login to DockerHub
- uses: docker/login-action@v2
+ uses: docker/login-action@v3
  with:
  username: ${{ secrets.DOCKERHUB_USERNAME }}
  password: ${{ secrets.DOCKERHUB_PASSWORD }}
@@ -61,23 +48,23 @@ jobs:
 
  - name: Build base image
  id: docker_build_base
- uses: docker/build-push-action@v3
+ uses: docker/build-push-action@v5
  with:
  context: .
  platforms: linux/amd64,linux/arm64
  file: Dockerfile
  push: true
  tags: |
  ${{ secrets.DOCKERHUB_REPO }}/postgis:base
- ${{ secrets.DOCKERHUB_REPO }}/postgis:base-${{ matrix.distro }}-${{ matrix.imageVersion }}-${{ matrix.imageVariant }}
+ ${{ secrets.DOCKERHUB_REPO }}/postgis:base-${{  matrix.imageVersion.imageDistro }}-${{ matrix.imageVersion.imageDistroVersion }}-${{ matrix.imageVersion.imageDistroVariant }}
  build-args: |
- DISTRO=${{ matrix.distro }}
- IMAGE_VERSION=${{ matrix.imageVersion }}
- IMAGE_VARIANT=${{ matrix.imageVariant }}
+ DISTRO=${{ matrix.imageVersion.imageDistro }}
+ IMAGE_VERSION=${{ matrix.imageVersion.imageDistroVersion }}
+ IMAGE_VARIANT=${{ matrix.imageVersion.imageDistroVariant }}
  GENERATE_ALL_LOCALE=1
  POSTGRES_MAJOR_VERSION=${{ matrix.postgresMajorVersion }}
  POSTGIS_MAJOR_VERSION=${{ matrix.postgisMajorVersion }}
- POSTGIS_MINOR_VERSION=${{ matrix.postgresMinorVersion }}
+ POSTGIS_MINOR_VERSION=${{ matrix.postgisMinorRelease }}
  cache-from: |
  type=gha,scope=test
  type=gha,scope=prod
@@ -87,7 +74,7 @@ jobs:
 
  - name: Build prod image
  id: docker_build_prod
- uses: docker/build-push-action@v3
+ uses: docker/build-push-action@v5
  with:
  context: .
  platforms: linux/amd64,linux/arm64
@@ -99,13 +86,13 @@ jobs:
  ${{ secrets.DOCKERHUB_REPO }}/postgis:${{ matrix.postgresMajorVersion }}-${{ matrix.postgisMajorVersion }}.${{ matrix.postgisMinorRelease }}
  ${{ secrets.DOCKERHUB_REPO }}/postgis:${{ matrix.postgresMajorVersion }}-${{ matrix.postgisMajorVersion }}.${{ matrix.postgisMinorRelease }}--v${{ steps.current_date.outputs.formatted }}
  build-args: |
- DISTRO=${{ matrix.distro }}
- IMAGE_VERSION=${{ matrix.imageVersion }}
- IMAGE_VARIANT=${{ matrix.imageVariant }}
+ DISTRO=${{ matrix.imageVersion.imageDistro }}
+ IMAGE_VERSION=${{ matrix.imageVersion.imageDistroVersion }}
+ IMAGE_VARIANT=${{ matrix.imageVersion.imageDistroVariant }}
  GENERATE_ALL_LOCALE=1
  POSTGRES_MAJOR_VERSION=${{ matrix.postgresMajorVersion }}
  POSTGIS_MAJOR_VERSION=${{ matrix.postgisMajorVersion }}
- POSTGIS_MINOR_VERSION=${{ matrix.postgresMinorVersion }}
+ POSTGIS_MINOR_VERSION=${{ matrix.postgisMinorRelease }}
  cache-from: |
  type=gha,scope=test
  type=gha,scope=prod