Skip to content
This repository has been archived by the owner on Apr 2, 2024. It is now read-only.

Commit

Permalink
Working around alpine and ubuntu bionic quirks
Browse files Browse the repository at this point in the history
  • Loading branch information
sumerman committed Jan 5, 2023
1 parent b161117 commit 19a8047
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 3 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,9 @@ jobs:
ls -la artifacts/*
- name: Test package
# No TS packages are available for PG15 on Ubuntu bionic to run our smoke test with.
# TODO remove this once we drop support for Bionic
if: ${{ format('{0}-{1}-pg{2}', matrix.os.distro, matrix.os.version, matrix.postgres.version) != 'ubuntu-bionic-pg15' }}
env:
DISTRO: ${{ matrix.os.distro }}
DISTRO_VERSION: ${{ matrix.os.version }}
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ We use the following categories for changes:
that need to be compressed [#576]
- Renamed `_ps_catalog.chunks_to_freeze` to `_ps_catalog.compressed_chunks_to_freeze` [#595]
- All docker images upgraded to use TimescaleDB 2.9 [#598]
- The extension is updated to add support PostgreSQL 15. [#590]

### Added
- Telemetry for active series and last updated [#534]
Expand Down
12 changes: 9 additions & 3 deletions alpine.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -119,15 +119,21 @@ RUN \
cd /pgextwlist && \
make

# FROM ${PREVIOUS_IMAGE} as prev_img
# A temp workaround to bootstrap the line of pg15 images
FROM ${PREVIOUS_IMAGE} as prev_img_12
FROM ${PREVIOUS_IMAGE} as prev_img_13
FROM ${PREVIOUS_IMAGE} as prev_img_14
FROM builder as prev_img_15

FROM prev_img_${PG_VERSION} as prev_img

# COPY over the new files to the image. Done as a seperate stage so we don't
# ship the build tools.
FROM timescale/timescaledb:${TIMESCALEDB_VERSION_FULL}-pg${PG_VERSION}
ARG PG_VERSION

# COPY --from=prev_img /usr/local/lib/postgresql/promscale* /usr/local/lib/postgresql
# COPY --from=prev_img /usr/local/share/postgresql/extension/promscale* /usr/local/share/postgresql/extension
COPY --from=prev_img /usr/local/lib/postgresql/promscale* /usr/local/lib/postgresql
COPY --from=prev_img /usr/local/share/postgresql/extension/promscale* /usr/local/share/postgresql/extension

COPY --from=builder /build/promscale/target/release/promscale-pg${PG_VERSION}/usr/local/lib/postgresql /usr/local/lib/postgresql
COPY --from=builder /build/promscale/target/release/promscale-pg${PG_VERSION}/usr/local/share/postgresql /usr/local/share/postgresql
Expand Down

0 comments on commit 19a8047

Please sign in to comment.