Add PG17 to docker workflows

timescale · Oct 8, 2024 · c2a28a8 · c2a28a8
1 parent b9231e6
commit c2a28a8
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 24 deletions.
diff --git a/.github/workflows/bitnami.yml b/.github/workflows/bitnami.yml
@@ -2,6 +2,8 @@ name: Release Bitnami Image
 on:
   push:
     branches: [ release_docker, dev-build ]
+  pull_request:
+    paths: .github/workflows/bitnami.yml
   workflow_dispatch:
     inputs:
       version:
@@ -16,7 +18,7 @@ on:
         default: false
 env:
   ORG: timescale #timescaledev
-  TS_VERSION: ${{ github.event.inputs.version || '2.15.0' }}
+  TS_VERSION: ${{ github.event.inputs.version || '2.17.0' }}
 jobs:
 
   # Build bitnami images of TimscaleDB.
@@ -29,7 +31,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        pg: [14, 15, 16]
+        pg: [14, 15, 16, 17]
         base-image: [postgresql, postgresql-repmgr]
 
     steps:

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
@@ -2,6 +2,8 @@ name: Release Docker Image
 on:
   push:
     branches: [ release_docker, dev-build ]
+  pull_request:
+    paths: .github/workflows/docker-image.yml
   workflow_dispatch:
     inputs:
       version:
@@ -16,7 +18,7 @@ on:
         default: false
 env:
   ORG: timescale #timescaledev
-  TS_VERSION: ${{ github.event.inputs.version || '2.15.0' }}
+  TS_VERSION: ${{ github.event.inputs.version || '2.17.0' }}
 jobs:
 
   # Build multi-arch TimescaleDB images for both TSL and OSS code.
@@ -27,7 +29,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        pg: [14, 15, 16]
+        pg: [14, 15, 16, 17]
         oss: [ "", "-oss" ]
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/docker-nightly-build.yml b/.github/workflows/docker-nightly-build.yml
@@ -4,6 +4,8 @@ on:
   push:
     branches:
       - cron_build
+  pull_request:
+    paths: .github/workflows/docker-nightly-build.yml
 
   workflow_dispatch:
 
@@ -26,7 +28,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        pg: [14, 15, 16]
+        pg: [14, 15, 16, 17]
 
     steps:
     - uses: actions/checkout@v4

diff --git a/.github/workflows/smoke-test.yml b/.github/workflows/smoke-test.yml
@@ -17,7 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        pg: [14, 15, 16]
+        pg: [14, 15, 16, 17]
         type: ['normal', 'repmgr-bitnami', 'bitnami']
     steps:
       - name: Check out the source

diff --git a/Dockerfile b/Dockerfile
@@ -35,32 +35,37 @@ LABEL maintainer="Timescale https://www.timescale.com"
 
 ARG PG_VERSION
 RUN set -ex; \
-    apk update; \
-    apk add --no-cache \
-        postgresql${PG_VERSION}-plpython3
+    if [ "$PG_VERSION" -lt 17 ]; then \
+        apk update; \
+        apk add --no-cache \
+            postgresql${PG_VERSION}-plpython3; \
+    fi
 
 ARG PGVECTOR_VERSION
+ARG PG_VERSION
 RUN set -ex; \
-    apk update; \
-    apk add --no-cache --virtual .vector-deps \
-        postgresql${PG_VERSION}-dev \
-        git \
-        build-base \
-        clang15 \
-        llvm15-dev \
-        llvm15; \
-    git clone --branch ${PGVECTOR_VERSION} https://github.com/pgvector/pgvector.git /build/pgvector; \
-    cd /build/pgvector; \
-    make; \
-    make install; \
-    apk del .vector-deps
+    if [ "$PG_VERSION" -lt 17 ]; then \
+        apk update; \
+        apk add --no-cache --virtual .vector-deps \
+            postgresql${PG_VERSION}-dev \
+            git \
+            build-base \
+            clang15 \
+            llvm15-dev \
+            llvm15; \
+        git clone --branch ${PGVECTOR_VERSION} https://github.com/pgvector/pgvector.git /build/pgvector; \
+        cd /build/pgvector; \
+        make; \
+        make install; \
+        apk del .vector-deps; \
+    fi
 
-# install pgai only on pg16+ and not on 32 bit arm
+# install pgai only on pg16 and not on 32 bit arm
 ARG PGAI_VERSION
 ARG PG_MAJOR_VERSION
 ARG TARGETARCH
 RUN set -ex; \
-    if [ "$PG_MAJOR_VERSION" -gt 15 ] && [ "$TARGETARCH" != "arm" ]; then \
+    if [ "$PG_MAJOR_VERSION" -eq 16 ] && [ "$TARGETARCH" != "arm" ]; then \
         apk update; \
         apk add --no-cache --virtual .pgai-deps \
             git \