WIP: bookworm, Arm64, (geo)Bundle, improved tagging

.circleci/config.yml

@@ -0,0 +1,162 @@
+# .circleci/config.yml
+
+# Circle CI arm64 builder
+version: 2.1
+
+orbs:
+  # https://circleci.com/developer/orbs/orb/circleci/docker
+  docker: circleci/[email protected]
+  # https://circleci.com/developer/orbs/orb/circleci/python
+  python: circleci/[email protected]
+  # https://circleci.com/developer/orbs/orb/circleci/shellcheck
+  shellcheck: circleci/[email protected]
+
+jobs:
+  build-arm64:
+    machine:
+      image: ubuntu-2204:current
+    resource_class: arm.medium
+    environment:
+      BUILDX_PLATFORMS: linux/arm64v8
+      DOCKER_BUILDKIT: '1'
+      PLATFORM: linux/arm64v8
+    parameters:
+      target-version-variant:
+        type: string
+    steps:
+      - checkout
+
+      - run:
+          name: Display pipeline.* values
+          command: |
+            echo 'pipeline.git.branch: <<pipeline.git.branch>>'
+            echo 'pipeline.git.revision: <<pipeline.git.revision>>'
+            echo 'pipeline.id: <<pipeline.id>>'
+            echo 'pipeline.project.git_url: <<pipeline.project.git_url>>'
+            echo 'pipeline.trigger_source: <<pipeline.trigger_source>>'
+            echo 'pipeline.schedule.name:<< pipeline.schedule.name >>'
+            echo 'pipeline.schedule.id:<< pipeline.schedule.id >>'
+
+      - docker/check:
+          registry: docker.io
+          docker-username: DOCKERHUB_USERNAME
+          docker-password: DOCKERHUB_ACCESS_TOKEN
+
+      - run:
+          name: Docker Ratelimit Check - before
+          # https://docs.docker.com/docker-hub/download-rate-limit/
+          command: |
+            TOKEN=$(curl --user "$DOCKERHUB_USERNAME:$DOCKERHUB_ACCESS_TOKEN" "https://auth.docker.io/token?service=registry.docker.io&scope=repository:ratelimitpreview/test:pull" | jq -r .token)
+            HEADERS=$(curl --head -H "Authorization: Bearer $TOKEN" https://registry-1.docker.io/v2/ratelimitpreview/test/manifests/latest)
+            echo "Rate Limit Info:"
+            echo "$HEADERS" | grep ratelimit
+
+      - run: uname -a
+      - run: docker --version
+      - run: docker info
+      - run: pip3 install --upgrade pip
+      - run: pip3 install --upgrade lastversion
+      - run: tools/install_manifest-tool.sh
+      - run: tools/install_dive.sh
+      - run: tools/environment_init.sh
+      - run: make check_version
+
+      - run:
+          name: Conditional Docker Check - Halt if not on master branch or if it's a PR or Weekly image exists
+          command: |
+            # Check if the current branch is 'master' and the weekly image is not extis
+            #    If weekly image exists, skip docker build and push
+            source tools/environment_init.sh
+            echo "check: << parameters.target-version-variant >>${IMAGE_VERSION_ID}"
+            check_image_exists "<< parameters.target-version-variant >>${IMAGE_VERSION_ID}" || true
+            if [ "$CIRCLE_BRANCH" == "master" ] && check_image_exists "<< parameters.target-version-variant >>${IMAGE_VERSION_ID}"; then
+              circleci-agent step halt
+            fi
+
+      - run: make -n test-<< parameters.target-version-variant >>
+      - run: make test-<< parameters.target-version-variant >>
+      - run: make scan-<< parameters.target-version-variant >> || true
+      - run: make dive-<< parameters.target-version-variant >> || true
+      - run: docker images
+
+      - run:
+          name: Conditional Docker Check - Halt if not on master branch or if it's a PR
+          command: |
+            # Check if the current branch is NOT 'master' or if the build is triggered by a pull request.
+            # If either of these conditions is met, halt the workflow.
+            if [ "$CIRCLE_BRANCH" != "master" ] || [ -n "$CIRCLE_PULL_REQUEST" ]; then
+              circleci-agent step halt
+            fi
+
+      - run:
+          name: "Push docker image : make push-<< parameters.target-version-variant >>"
+          command: |
+            if [ "$CIRCLE_BRANCH" == "master" ] && [ -z "$CIRCLE_PULL_REQUEST" ]; then
+              make push-<< parameters.target-version-variant >>
+              make manifest-<< parameters.target-version-variant >>
+              echo "...push and manifest done..."
+            fi
+
+      - run:
+          name: Docker Ratelimit Check - after
+          # https://docs.docker.com/docker-hub/download-rate-limit/
+          command: |
+            TOKEN=$(curl --user "$DOCKERHUB_USERNAME:$DOCKERHUB_ACCESS_TOKEN" "https://auth.docker.io/token?service=registry.docker.io&scope=repository:ratelimitpreview/test:pull" | jq -r .token)
+            HEADERS=$(curl --head -H "Authorization: Bearer $TOKEN" https://registry-1.docker.io/v2/ratelimitpreview/test/manifests/latest)
+            echo "Rate Limit Info:"
+            echo "$HEADERS" | grep ratelimit
+
+
+workflows:
+  build-deploy:
+#   AND triggered by the app.circleci.com UI
+#   daily run : Repeats everyday every month ; 6:00am UTC, 1 (once per hour).
+    jobs:
+      - build-arm64:
+          matrix:
+            parameters:
+              target-version-variant: [
+#
+# They are created using the ./apply-ci.sh script based on the version.json file,
+#      where the architecture is defined as "arm64".
+# These "--skip--" images serve as inputs for the "*-bundle" images,
+#       hence they must be generated within the bundle JOB.
+#
+#circleci-targets-start
+                "12-3.3-alpine3.20",
+                "12-3.4-alpine3.19",
+                "12-3.4-alpine3.20",
+                "12-3.4-bookworm",
+                "12-3.4-bullseye",
+                "13-3.3-alpine3.20",
+                "13-3.4-alpine3.19",
+                "13-3.4-alpine3.20",
+                "13-3.4-bookworm",
+                "13-3.4-bullseye",
+                "14-3.3-alpine3.20",
+                "14-3.4-alpine3.19",
+                "14-3.4-alpine3.20",
+                "14-3.4-bookworm",
+                "14-3.4-bullseye",
+                "14-l3.1.9gcp-bookworm",
+                "15-3.3-alpine3.20",
+                "15-3.4-alpine3.19",
+                "15-3.4-alpine3.20",
+#   --skip--    "15-3.4-bookworm",  -->  generated with the related bundle job!
+                "15-3.4-bullseye",
+                "15-3.4-bundle0-bookworm",
+                "15-master-bookworm",
+                "15-recent-bookworm",
+                "16-3.3-alpine3.20",
+                "16-3.4-alpine3.19",
+                "16-3.4-alpine3.20",
+#   --skip--    "16-3.4-bookworm",  -->  generated with the related bundle job!
+                "16-3.4-bullseye",
+                "16-3.4-bundle0-bookworm",
+                "16-master-bookworm",
+                "16-recent-bookworm",
+                "17rc1-3.4-alpine3.20",
+                "17rc1-master-bookworm",
+                "17rc1-recent-bookworm",
+#circleci-targets-end
+              ]

.dockerignore

@@ -1,3 +1,21 @@
-Dockerfile
 .git
 _*
+.jq-template.awk
+.template-helper-functions.jq
+.vscode/
+
+.git/
+.github/
+.gitignore
+.circleci/
+
+docs/
+README.md
+version.json
+
+Dockerfile.*.template
+localetest.sh
+apply-*.sh
+
+trivy_cache
+tmp/

.env

@@ -0,0 +1,22 @@
+# PROD setup
+#
+# Setup info, used by:
+#  ./update.sh and other scripts ( ./apply-*.sh )
+#  ./Makefile
+#  ./.github/workflows/main.yml
+#  ./.circleci/config.yml
+#
+# IF your are changing the values, please run ./update.sh
+#     to update some hard coded values in the Dockerfiles or README.md
+#
+
+REGISTRY=docker.io
+REPO_NAME=imresamu
+IMAGE_NAME=postgis
+DOCKERHUB_README_REPOSITORY=imresamu/postgis
+
+dockerhublink='https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name='
+githubrepolink='https://github.com/imresamu/docker-postgis/blob/master'
+
+ENABLE_IMAGE_ARCH=true
+ENABLE_IMAGE_VERSION_ID=true

.env.test

@@ -0,0 +1,23 @@
+# Test Setup ; if TEST=true
+#
+# Setup info, used by:
+#  ./update.sh and other scripts ( ./apply-*.sh )
+#  ./Makefile
+#  ./.github/workflows/main.yml
+#  ./.circleci/config.yml
+#
+# IF your are changing the values, please run ./update.sh
+#     to update some hard coded values in the Dockerfiles or README.md
+#
+
+REGISTRY=localhost:5000
+REPO_NAME=testrepo
+IMAGE_NAME=testpostgisimage
+DOCKERHUB_README_REPOSITORY=testrepo/testpostgisimage
+
+dockerhublink='https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name='
+githubrepolink='https://github.com/postgis/docker-postgis/blob/master'
+
+ENABLE_IMAGE_ARCH=true
+ENABLE_IMAGE_VERSION_ID=true
+

.gitattributes

@@ -0,0 +1,11 @@
+# https://github.com/actions/checkout/issues/135#issuecomment-613361104
+* text eol=lf
+
+/*/**/Dockerfile            linguist-generated
+/*/**/initdb-postgis.sh     linguist-generated
+/*/**/update-postgis.sh     linguist-generated
+/*/**/tags                  linguist-generated
+.github/workflows/main.yml  linguist-generated
+versions.json               linguist-generated
+README.md                   linguist-generated
+/Dockerfile*.template       linguist-language=Dockerfile

.github/workflows/localtest.yml

@@ -0,0 +1,21 @@
+name: "Localtest"
+# testing the workflow
+on:
+  push:
+  pull_request:
+  schedule:
+      - cron: '15 5 * * 1'
+
+jobs:
+  localtest:
+    name: "testing ./localtest.sh ( update.sh and build test and push to local registry )"
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v4
+      - run: docker ps -a
+      - run: pip3 install --upgrade pip
+      - run: pip3 install --upgrade lastversion
+      - run: tools/install_manifest-tool.sh
+      - run: tools/environment_init.sh
+      - run: ./localtest.sh
+      - run: docker images