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

PG17 release #277

Merged
merged 1 commit into from
Feb 13, 2025
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
38 changes: 37 additions & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,37 @@ jobs:
tags: |
flyio/postgres-flex-timescaledb:16
flyio/postgres-flex-timescaledb:16.6

-
name: Build and push Postgres 17
id: docker_build_17
uses: docker/build-push-action@v3
with:
build-args: |
PG_VERSION=17.2
PG_MAJOR_VERSION=17
VERSION=${{ steps.get-latest-tag.outputs.tag }}
context: .
file: ./pg17/Dockerfile
push: true
tags: |
flyio/postgres-flex:17
flyio/postgres-flex:17.2
-
name: Build and push Postgres 17 Timescale DB
id: docker_build_17_timescaledb
uses: docker/build-push-action@v3
with:
build-args: |
PG_VERSION=17.2
PG_MAJOR_VERSION=17
VERSION=${{ steps.get-latest-tag.outputs.tag }}
context: .
file: ./pg17/Dockerfile-timescaledb
push: true
tags: |
flyio/postgres-flex-timescaledb:17
flyio/postgres-flex-timescaledb:17.2
-
name: Postgres 15 Image digest
run: echo ${{ steps.docker_build_15.outputs.digest }}
Expand All @@ -103,4 +134,9 @@ jobs:
-
name: Postgres 16 TimescaleDB Image digest
run: echo ${{ steps.docker_build_16_timescaledb.outputs.digest }}

-
name: Postgres 17 Image digest
run: echo ${{ steps.docker_build_17.outputs.digest }}
-
name: Postgres 17 TimescaleDB Image digest
run: echo ${{ steps.docker_build_17_timescaledb.outputs.digest }}
96 changes: 96 additions & 0 deletions pg17/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
ARG PG_VERSION=17.2
ARG PG_MAJOR_VERSION=17
ARG VERSION=custom

FROM golang:1.23 AS builder

WORKDIR /go/src/github.com/fly-apps/fly-postgres
COPY . .

RUN CGO_ENABLED=0 GOOS=linux \
go build -v -o /fly/bin/event_handler ./cmd/event_handler && \
go build -v -o /fly/bin/failover_validation ./cmd/failover_validation && \
go build -v -o /fly/bin/pg_unregister ./cmd/pg_unregister && \
go build -v -o /fly/bin/start_monitor ./cmd/monitor && \
go build -v -o /fly/bin/start_admin_server ./cmd/admin_server && \
go build -v -o /fly/bin/start ./cmd/start && \
go build -v -o /fly/bin/flexctl ./cmd/flexctl


COPY ./bin/* /fly/bin/

FROM ubuntu:24.04

ARG VERSION
ARG PG_MAJOR_VERSION
ARG PG_VERSION
ARG POSTGIS_MAJOR=3
ARG HAPROXY_VERSION=2.8
ARG REPMGR_VERSION=5.5.0+debpgdg-1.pgdg24.04+1

ENV PGDATA=/data/postgresql
ENV PGPASSFILE=/data/.pgpass
ENV AWS_SHARED_CREDENTIALS_FILE=/data/.aws/credentials
ENV PG_MAJOR_VERSION=${PG_MAJOR_VERSION}
ENV PATH="/usr/lib/postgresql/${PG_MAJOR_VERSION}/bin:$PATH"


LABEL fly.app_role=postgres_cluster
LABEL fly.version=${VERSION}
LABEL fly.pg-version=${PG_VERSION}
LABEL fly.pg-manager=repmgr

# make the "en_US.UTF-8" locale so postgres will be utf-8 enabled by default
RUN set -eux; \
if [ -f /etc/dpkg/dpkg.cfg.d/docker ]; then \
# if this file exists, we're likely in "debian:xxx-slim", and locales are thus being excluded so we need to remove that exclusion (since we need locales)
grep -q '/usr/share/locale' /etc/dpkg/dpkg.cfg.d/docker; \
sed -ri '/\/usr\/share\/locale/d' /etc/dpkg/dpkg.cfg.d/docker; \
! grep -q '/usr/share/locale' /etc/dpkg/dpkg.cfg.d/docker; \
fi; \
apt-get update; apt-get install -y --no-install-recommends locales; rm -rf /var/lib/apt/lists/*; \
echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen; \
locale-gen; \
locale -a | grep 'en_US.utf8'
ENV LANG en_US.utf8

RUN apt-get update && apt-get install --no-install-recommends -y \
ca-certificates iproute2 curl bash dnsutils vim socat procps ssh gnupg rsync barman-cli barman barman-cli-cloud python3-setuptools cron gosu \
&& apt autoremove -y && apt clean && \
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

# Install PostgreSQL
RUN curl -fsSL https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor -o /usr/share/keyrings/postgresql-archive-keyring.gpg && \
echo "deb [signed-by=/usr/share/keyrings/postgresql-archive-keyring.gpg] http://apt.postgresql.org/pub/repos/apt/ noble-pgdg main" > /etc/apt/sources.list.d/pgdg.list && \
apt-get update && apt-get install --no-install-recommends -y \
postgresql-${PG_MAJOR_VERSION} \
postgresql-client-${PG_MAJOR_VERSION} \
postgresql-contrib-${PG_MAJOR_VERSION} \
postgresql-${PG_MAJOR_VERSION}-repmgr=${REPMGR_VERSION}

# PostGIS
RUN apt-get update && apt-get install --no-install-recommends -y \
postgresql-${PG_MAJOR_VERSION}-postgis-$POSTGIS_MAJOR \
postgresql-${PG_MAJOR_VERSION}-postgis-$POSTGIS_MAJOR-scripts

# Haproxy
RUN apt-get update && apt-get install --no-install-recommends -y \
haproxy=$HAPROXY_VERSION.\* \
&& apt autoremove -y && apt clean

# Copy Go binaries from the builder stage
COPY --from=builder /fly/bin/* /usr/local/bin

# Copy Postgres exporter
COPY --from=wrouesnel/postgres_exporter:latest /postgres_exporter /usr/local/bin/

# Move pg_rewind into path.
RUN ln -s /usr/lib/postgresql/${PG_MAJOR_VERSION}/bin/pg_rewind /usr/bin/pg_rewind

ADD /config/* /fly/
RUN mkdir -p /run/haproxy/
RUN usermod -d /data postgres

EXPOSE 5432

CMD ["start"]
102 changes: 102 additions & 0 deletions pg17/Dockerfile-timescaledb
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
ARG PG_VERSION=17.2
ARG PG_MAJOR_VERSION=17
ARG VERSION=custom

FROM golang:1.23 AS builder

WORKDIR /go/src/github.com/fly-apps/fly-postgres
COPY . .

RUN CGO_ENABLED=0 GOOS=linux \
go build -v -o /fly/bin/event_handler ./cmd/event_handler && \
go build -v -o /fly/bin/failover_validation ./cmd/failover_validation && \
go build -v -o /fly/bin/pg_unregister ./cmd/pg_unregister && \
go build -v -o /fly/bin/start_monitor ./cmd/monitor && \
go build -v -o /fly/bin/start_admin_server ./cmd/admin_server && \
go build -v -o /fly/bin/start ./cmd/start && \
go build -v -o /fly/bin/flexctl ./cmd/flexctl


COPY ./bin/* /fly/bin/

FROM ubuntu:24.04

ARG VERSION
ARG PG_MAJOR_VERSION
ARG PG_VERSION
ARG POSTGIS_MAJOR=3
ARG HAPROXY_VERSION=2.8
ARG REPMGR_VERSION=5.5.0+debpgdg-1.pgdg24.04+1

ENV PGDATA=/data/postgresql
ENV PGPASSFILE=/data/.pgpass
ENV AWS_SHARED_CREDENTIALS_FILE=/data/.aws/credentials
ENV PG_MAJOR_VERSION=${PG_MAJOR_VERSION}
ENV PATH="/usr/lib/postgresql/${PG_MAJOR_VERSION}/bin:$PATH"

LABEL fly.app_role=postgres_cluster
LABEL fly.version=${VERSION}
LABEL fly.pg-version=${PG_VERSION}
LABEL fly.pg-manager=repmgr

# make the "en_US.UTF-8" locale so postgres will be utf-8 enabled by default
RUN set -eux; \
if [ -f /etc/dpkg/dpkg.cfg.d/docker ]; then \
# if this file exists, we're likely in "debian:xxx-slim", and locales are thus being excluded so we need to remove that exclusion (since we need locales)
grep -q '/usr/share/locale' /etc/dpkg/dpkg.cfg.d/docker; \
sed -ri '/\/usr\/share\/locale/d' /etc/dpkg/dpkg.cfg.d/docker; \
! grep -q '/usr/share/locale' /etc/dpkg/dpkg.cfg.d/docker; \
fi; \
apt-get update; apt-get install -y --no-install-recommends locales; rm -rf /var/lib/apt/lists/*; \
echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen; \
locale-gen; \
locale -a | grep 'en_US.utf8'
ENV LANG en_US.utf8

RUN apt-get update && apt-get install --no-install-recommends -y \
ca-certificates iproute2 curl bash dnsutils vim socat procps ssh gnupg rsync barman-cli barman barman-cli-cloud python3-setuptools cron gosu \
&& apt autoremove -y && apt clean && \
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

# Install PostgreSQL
RUN curl -fsSL https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor -o /usr/share/keyrings/postgresql-archive-keyring.gpg && \
echo "deb [signed-by=/usr/share/keyrings/postgresql-archive-keyring.gpg] http://apt.postgresql.org/pub/repos/apt/ noble-pgdg main" > /etc/apt/sources.list.d/pgdg.list && \
apt-get update && apt-get install --no-install-recommends -y \
postgresql-${PG_MAJOR_VERSION} \
postgresql-client-${PG_MAJOR_VERSION} \
postgresql-contrib-${PG_MAJOR_VERSION} \
postgresql-${PG_MAJOR_VERSION}-repmgr=${REPMGR_VERSION}

# TimescaleDB and PostGIS
RUN echo "deb https://packagecloud.io/timescale/timescaledb/ubuntu/ jammy main" > /etc/apt/sources.list.d/timescaledb.list \
&& curl -L https://packagecloud.io/timescale/timescaledb/gpgkey | apt-key add -

RUN apt-get update && apt-get install --no-install-recommends -y \
postgresql-$PG_MAJOR_VERSION-postgis-$POSTGIS_MAJOR \
postgresql-$PG_MAJOR_VERSION-postgis-$POSTGIS_MAJOR-scripts \
timescaledb-2-postgresql-$PG_MAJOR_VERSION \
&& apt autoremove -y && apt clean

# Haproxy
RUN apt-get update && apt-get install --no-install-recommends -y \
haproxy=$HAPROXY_VERSION.\* \
&& apt autoremove -y && apt clean

# Copy Go binaries from the builder stage
COPY --from=builder /fly/bin/* /usr/local/bin

# Copy Postgres exporter
COPY --from=wrouesnel/postgres_exporter:latest /postgres_exporter /usr/local/bin/

# Move pg_rewind into path.
RUN ln -s /usr/lib/postgresql/${PG_MAJOR_VERSION}/bin/pg_rewind /usr/bin/pg_rewind

ADD /config/* /fly/
RUN mkdir -p /run/haproxy/
RUN usermod -d /data postgres

ENV TIMESCALEDB_ENABLED=true

EXPOSE 5432

CMD ["start"]
Loading