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

Fix building db service with pg_amqp and new base image #268

Merged
merged 1 commit into from
Feb 9, 2024
Merged
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
8 changes: 5 additions & 3 deletions build/postgres/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
ARG POSTGRES_VERSION=12
FROM postgres:${POSTGRES_VERSION}
ARG POSTGRES_IMAGE_VARIANT=bookworm
ARG POSTGRES_IMAGE_TAG=${POSTGRES_VERSION}-${POSTGRES_IMAGE_VARIANT}
FROM postgres:${POSTGRES_IMAGE_TAG}

ARG POSTGRES_VERSION
LABEL org.metabrainz.based-on-image="postgres:${POSTGRES_VERSION}"
LABEL org.metabrainz.based-on-image="postgres:${POSTGRES_IMAGE_TAG}"

ARG DEBIAN_FRONTEND=noninteractive

Expand Down Expand Up @@ -33,6 +35,6 @@ ARG PG_AMQP_GIT_REF="240d477d40c5e7a579b931c98eb29cef4edda164"
RUN git clone https://github.com/omniti-labs/pg_amqp.git /tmp/pg_amqp \
&& cd /tmp/pg_amqp \
&& git checkout "$PG_AMQP_GIT_REF" \
&& make \
&& make PG_CPPFLAGS=-Wno-error=implicit-int \
&& make install \
&& rm -R /tmp/*