ci: use pg_dump from postgres 14

fixes https://github.com/hasura/graphql-engine/issues/7676

PR-URL: https://github.com/hasura/graphql-engine-mono/pull/4254
GitOrigin-RevId: ca27952516bd60605c27254fce7f5267f472d9d5
This commit is contained in:
Vishnu Bharathi 2022-04-18 11:54:03 +05:30 committed by hasura-bot
parent 08b878bc9f
commit 810db83499
5 changed files with 27 additions and 6 deletions

View File

@ -4,6 +4,7 @@
### Bug fixes and improvements
- server: fix parsing remote relationship json definition from 1.x server catalog on migration (fix #7906)
- server: update pg_dump to be compatible with postgres 14 (#7676)
## v2.6.0-beta.1

View File

@ -1,4 +1,4 @@
# DATE VERSION: 2022-03-31
# DATE VERSION: 2022-04-12
# Modify the above date version (YYYY-MM-DD) if you want to rebuild the image for security updates
FROM quay.io/centos/centos@sha256:fc45f3e1294861d7851a87be152b1ab2350d755744077d5ee12b725fdca87919
@ -23,13 +23,14 @@ RUN yum update -y --nobest \
&& case "$TARGETPLATFORM" in \
"linux/amd64") \
dnf install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-8-x86_64/pgdg-redhat-repo-latest.noarch.rpm \
&& dnf install -y postgresql13-devel \
;; \
"linux/arm64") \
dnf install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-8-aarch64/pgdg-redhat-repo-latest.noarch.rpm \
&& dnf install -y postgresql13-devel \
;; \
esac
esac \
&& dnf install -y postgresql14-devel \
# delete all pg tools except pg_dump to keep the image minimal
&& find /usr/bin -name 'pg*' -not -path '/usr/bin/pg_dump' -delete
# msodbcsql17
RUN yum remove unixODBC-utf16 unixODBC-utf16-devel \

View File

@ -1,3 +1,5 @@
# DATE VERSION: 2022-04-12
# Modify the above date version (YYYY-MM-DD) if you want to rebuild the image for security updates
FROM debian:buster-20210511-slim
# TARGETPLATFORM is automatically set up by docker buildx based on the platform we are targetting for
@ -19,6 +21,15 @@ RUN if [ "$TARGETPLATFORM" = "linux/amd64" ] ; then \
&& ACCEPT_EULA=Y apt-get install -y msodbcsql17 ; \
fi
# Install pg_dump
RUN echo "deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main" > /etc/apt/sources.list.d/pgdg.list \
&& curl -s https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
&& apt-get -y update \
&& apt-get install -y \
postgresql-client-14 \
# delete all pg tools except pg_dump to keep the image minimal
&& find /usr/bin -name 'pg*' -not -path '/usr/bin/pg_dump' -delete
# Cleanup unwanted files and packages
RUN apt-get -y remove curl gnupg2 \
&& apt-get -y auto-remove \

View File

@ -1,4 +1,4 @@
# DATE VERSION: 2022-04-07
# DATE VERSION: 2022-04-12
# Modify the above date version (YYYY-MM-DD) if you want to rebuild the image for security updates
FROM ubuntu:20.04
@ -21,6 +21,15 @@ RUN if [ "$TARGETPLATFORM" = "linux/amd64" ] ; then \
&& ACCEPT_EULA=Y apt-get install -y msodbcsql17 ; \
fi
# Install pg_dump
RUN echo "deb http://apt.postgresql.org/pub/repos/apt focal-pgdg main" > /etc/apt/sources.list.d/pgdg.list \
&& curl -s https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
&& apt-get -y update \
&& apt-get install -y \
postgresql-client-14 \
# delete all pg tools except pg_dump to keep the image minimal
&& find /usr/bin -name 'pg*' -not -path '/usr/bin/pg_dump' -delete
# Cleanup unwanted files and packages
RUN apt-get -y remove curl gnupg2 \
&& apt-get -y auto-remove \

View File

@ -3,7 +3,6 @@ ARG BASE_IMAGE
FROM ${BASE_IMAGE}
COPY rootfs/graphql-engine /bin/
COPY rootfs/pg_dump /bin/
COPY rootfs/srv/ /srv/
CMD ["graphql-engine", "serve"]