publish docker images/image updates for major versions

.github/workflows/dockerhub-release-matrix.yml

@@ -0,0 +1,197 @@
+name: Release all major versions on Dockerhub
+
+on:
+  push:
+    branches:
+      - develop
+      - release/*
+      - sam/docker-oriole17
+    paths:
+      - '**'
+  workflow_dispatch:
+
+jobs:
+  prepare:
+    runs-on: ubuntu-latest
+    outputs:
+      matrix_config: ${{ steps.set-matrix.outputs.matrix_config }}
+    steps:
+      - uses: DeterminateSystems/nix-installer-action@main
+      - name: Checkout Repo
+        uses: actions/checkout@v3
+      - name: Generate build matrix
+        id: set-matrix
+        run: |
+          nix run nixpkgs#nushell -- -c 'let versions = (open ansible/vars.yml | get postgres_major)
+          let matrix = ($versions | each { |ver|
+            let version = ($ver | str trim)
+            let dockerfile = $"Dockerfile-($version)"
+            if ($dockerfile | path exists) {
+              {
+                version: $version,
+                dockerfile: $dockerfile
+              }
+            } else {
+              null
+            }
+          } | compact)
+
+          let matrix_config = {
+            include: $matrix
+          }
+
+          $"matrix_config=($matrix_config | to json -r)" | save --append $env.GITHUB_OUTPUT'
+  build:
+    needs: prepare
+    strategy:
+      matrix: ${{ fromJson(needs.prepare.outputs.matrix_config) }}
+    runs-on: ubuntu-latest
+    outputs:
+      build_args: ${{ steps.args.outputs.result }}
+    steps:
+      - uses: actions/checkout@v3
+      - uses: DeterminateSystems/nix-installer-action@main
+      - name: Set PostgreSQL version environment variable
+        run: echo "POSTGRES_MAJOR_VERSION=${{ matrix.version }}" >> $GITHUB_ENV
+
+      - id: args
+        run: |
+          nix run nixpkgs#nushell -- -c '
+            open ansible/vars.yml 
+            | items { |key value| {name: $key, item: $value} } 
+            | where { |it| ($it.item | describe) == "string" } 
+            | each { |it| $"($it.name)=($it.item)" } 
+            | str join "\n" 
+            | save --append $env.GITHUB_OUTPUT
+          '    
+  build_release_image:
+    needs: [prepare, build]
+    strategy:
+      matrix:
+        postgres: ${{ fromJson(needs.prepare.outputs.matrix_config).include }}
+        arch: [amd64, arm64]
+    runs-on: ${{ matrix.arch == 'amd64' && 'ubuntu-latest' || 'arm-runner' }}
+    timeout-minutes: 180
+    steps:
+      - uses: actions/checkout@v3
+      - uses: DeterminateSystems/nix-installer-action@main
+      - run: docker context create builders
+      - uses: docker/setup-buildx-action@v3
+        with:
+          endpoint: builders
+      - uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      - name: Get image tag
+        id: image
+        run: |
+          if [[ "${{ matrix.arch }}" == "arm64" ]]; then
+            pg_version=$(sudo nix run nixpkgs#nushell -- -c '
+              let version = "${{ matrix.postgres.version }}"
+              let release_key = if ($version | str contains "orioledb") {
+                $"postgresorioledb-17"
+              } else {
+                $"postgres($version)"
+              }
+              open ansible/vars.yml | get postgres_release | get $release_key | str trim
+            ')
+            echo "pg_version=supabase/postgres:$pg_version" >> $GITHUB_OUTPUT
+          else
+            pg_version=$(nix run nixpkgs#nushell -- -c '
+              let version = "${{ matrix.postgres.version }}"
+              let release_key = if ($version | str contains "orioledb") {
+                $"postgresorioledb-17"
+              } else {
+                $"postgres($version)"
+              }
+              open ansible/vars.yml | get postgres_release | get $release_key | str trim
+            ')
+            echo "pg_version=supabase/postgres:$pg_version" >> $GITHUB_OUTPUT
+          fi
+      - id: build
+        uses: docker/build-push-action@v5
+        with:
+          push: true
+          build-args: |
+            ${{ needs.build.outputs.build_args }}
+          target: production
+          tags: ${{ steps.image.outputs.pg_version }}_${{ matrix.arch }}
+          platforms: linux/${{ matrix.arch }}
+          cache-from: type=gha,scope=${{ github.ref_name }}-latest-${{ matrix.arch }}
+          cache-to: type=gha,mode=max,scope=${{ github.ref_name }}-latest-${{ matrix.arch }}
+          file: ${{ matrix.postgres.dockerfile }}
+  merge_manifest:
+    needs: [prepare, build, build_release_image]
+    strategy:
+      matrix:
+        include: ${{ fromJson(needs.prepare.outputs.matrix_config).include }}
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: DeterminateSystems/nix-installer-action@main
+      - uses: docker/setup-buildx-action@v3
+      - uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      - name: Get image tag
+        id: get_version
+        run: |
+          nix run nixpkgs#nushell -- -c '
+            let version = "15"
+            let release_key = if ($version | str contains "orioledb") {
+              $"postgres($version | str replace "-" "")"
+            } else {
+              $"postgres($version)"
+            }
+            let pg_version = (open ansible/vars.yml | get postgres_release | get $release_key | str trim)
+
+            $"pg_version=($pg_version)" | save --append $env.GITHUB_OUTPUT
+          ' 
+      - name: Merge multi-arch manifests
+        run: |
+          docker buildx imagetools create -t supabase/postgres:${{ steps.get_version.outputs.pg_version }} \
+          supabase/postgres:${{ steps.get_version.outputs.pg_version }}_amd64 \
+          supabase/postgres:${{ steps.get_version.outputs.pg_version }}_arm64
+  get_publish_version:
+    needs: [prepare, merge_manifest]
+    runs-on: ubuntu-latest
+    outputs:
+      matrix: ${{ steps.get_versions.outputs.matrix }}
+    steps:
+      - uses: actions/checkout@v3
+      - uses: DeterminateSystems/nix-installer-action@main
+      - name: Get version
+        id: get_versions
+        run: |
+          nix run nixpkgs#nushell -- -c '
+            let original_matrix = ${{ needs.prepare.outputs.matrix_config }}
+            let versions = $original_matrix.include
+            let processed_versions = ($versions | each { |item| 
+              let version = $item.version
+              let release_key = if ($version | str contains "orioledb") {
+                $"postgresorioledb-17"
+              } else {
+                $"postgres($version)"
+              }
+              let pg_version = (open ansible/vars.yml | get postgres_release | get $release_key | str trim)
+
+              # Include both AMD64 and ARM64 architectures
+              [{version: $pg_version, arch: "amd64"}, {version: $pg_version, arch: "arm64"}]
+            } | flatten)
+
+            let matrix = {include: $processed_versions}
+            let matrix_json = ($matrix | to json -r)
+            $"matrix=($matrix_json)" | save --append $env.GITHUB_OUTPUT
+          '
+
+  publish:
+    needs: get_publish_version
+    strategy:
+      matrix: ${{ fromJson(needs.get_publish_version.outputs.matrix) }}
+    uses: ./.github/workflows/mirror.yml
+    with:
+      version: ${{ matrix.version }}
+      arch: ${{ matrix.arch }}
+    secrets: inherit

.github/workflows/mirror.yml

@@ -6,12 +6,19 @@ on:
       version:
         required: true
         type: string
+      arch:
+        required: true
+        type: string
   workflow_dispatch:
     inputs:
       version:
         description: "Image tag"
         required: true
         type: string
+      arch:
+        description: "Architecture"
+        required: true
+        type: string
 
 jobs:
   mirror:
@@ -36,7 +43,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       - uses: akhilerm/[email protected]
         with:
-          src: docker.io/supabase/postgres:${{ inputs.version }}
+          src: docker.io/supabase/postgres:${{ inputs.version }}_${{ inputs.arch }}
           dst: |
-            public.ecr.aws/supabase/postgres:${{ inputs.version }}
-            ghcr.io/supabase/postgres:${{ inputs.version }}
+            public.ecr.aws/supabase/postgres:${{ inputs.version }}_${{ inputs.arch }}
+            ghcr.io/supabase/postgres:${{ inputs.version }}_${{ inputs.arch }}

Dockerfile-15

@@ -41,26 +41,14 @@ ARG wal_g_release=2.0.1
 
 FROM ubuntu:focal as base
 
-
-ENV DEBIAN_FRONTEND=noninteractive \
-    DEBCONF_NONINTERACTIVE_SEEN=true \
-    TZ=Etc/UTC
-
-# Pre-configure tzdata before any installations
-RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && \
-    echo $TZ > /etc/timezone && \
-    apt-get update && \
-    apt-get install -y --no-install-recommends tzdata && \
-    apt-get install -y \
+RUN apt update -y && apt install -y \
     curl \
     gnupg \
     lsb-release \
     software-properties-common \
     wget \
     sudo \
-    git \
-    && apt clean && \
-    rm -rf /var/lib/apt/lists/*
+    && apt clean
 
 
 RUN adduser --system  --home /var/lib/postgresql --no-create-home --shell /bin/bash --group --gecos "PostgreSQL administrator" postgres
@@ -87,11 +75,9 @@ WORKDIR /
 RUN mkdir -p /usr/lib/postgresql/bin \
     /usr/lib/postgresql/share/postgresql \
     /usr/share/postgresql \
-    # /usr/lib/postgresql/share/postgresql/contrib \
-    #/usr/lib/postgresql/share/postgresql/timezonesets \
-    #/usr/lib/postgresql/share/postgresql/tsearch_data \
-    # /usr/lib/postgresql/share/postgresql/extension \
+    /var/lib/postgresql \
     && chown -R postgres:postgres /usr/lib/postgresql \
+    && chown -R postgres:postgres /var/lib/postgresql \
     && chown -R postgres:postgres /usr/share/postgresql
 
 # Create symbolic links
@@ -114,6 +100,12 @@ RUN chown -R postgres:postgres /usr/lib/postgresql
 RUN ln -sf /usr/lib/postgresql/share/postgresql/timezonesets /usr/share/postgresql/timezonesets
 
 
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends tzdata
+
+RUN ln -fs /usr/share/zoneinfo/Etc/UTC /etc/localtime && \
+    dpkg-reconfigure --frontend noninteractive tzdata
+
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
     build-essential \