Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add PG17 to docker workflows #273

Merged
merged 1 commit into from
Oct 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .github/workflows/bitnami.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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.
Expand All @@ -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:
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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.
Expand All @@ -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
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/docker-nightly-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ on:
push:
branches:
- cron_build
pull_request:
paths: .github/workflows/docker-nightly-build.yml

workflow_dispatch:

Expand All @@ -26,7 +28,7 @@ jobs:
strategy:
fail-fast: false
matrix:
pg: [14, 15, 16]
pg: [14, 15, 16, 17]

steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/smoke-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
41 changes: 23 additions & 18 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
Loading