Skip to content

Commit

Permalink
Pin Postgres container to 14.7-alpine. (#1360)
Browse files Browse the repository at this point in the history
* Pin Postgres container to 14.7-alpine.

This is a temporary workaround to an issue in the latest version of the
Postgres containers, and will be reverted once a fix is available.

* Also pin ephemeral datastore container version.
  • Loading branch information
branlwyd authored May 12, 2023
1 parent 89da426 commit 86750f8
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
3 changes: 2 additions & 1 deletion Dockerfile.interop_aggregator
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ RUN --mount=type=cache,target=/usr/local/cargo/registry \
cp /src/target/$PROFILE/aggregation_job_driver /aggregation_job_driver && \
cp /src/target/$PROFILE/collection_job_driver /collection_job_driver

FROM postgres:14-alpine
# TODO(#1359): switch back to postgres:14-alpine once possible
FROM postgres:14.7-alpine
RUN mkdir /logs && mkdir /etc/janus
RUN apk add --update supervisor && rm -rf /tmp/* /var/cache/apk/*
COPY db /etc/janus/migrations
Expand Down
3 changes: 2 additions & 1 deletion aggregator_core/src/datastore/test_util.rs
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,9 @@ impl EphemeralDatabase {
move || {
// Start an instance of Postgres running in a container.
let container_client = testcontainers::clients::Cli::default();
// TODO(#1359): switch back to postgres:14-alpine once possible
let db_container = container_client
.run(RunnableImage::from(Postgres::default()).with_tag("14-alpine"));
.run(RunnableImage::from(Postgres::default()).with_tag("14.7-alpine"));
const POSTGRES_DEFAULT_PORT: u16 = 5432;
let port_number = db_container.get_host_port_ipv4(POSTGRES_DEFAULT_PORT);
trace!("Postgres container is up with port {port_number}");
Expand Down

0 comments on commit 86750f8

Please sign in to comment.