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

vimc-6447 upgrade to postgres 14 #167

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
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
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM postgres:10.3
FROM postgres:14.2
COPY bin /montagu-bin
ENV PATH="/montagu-bin:$PATH"
ENV POSTGRES_DB montagu
Expand All @@ -14,7 +14,7 @@ RUN cat /etc/montagu/postgresql.conf /etc/montagu/postgresql.test.conf.in > \
RUN cat /etc/montagu/postgresql.conf /etc/montagu/postgresql.production.conf.in > \
/etc/montagu/postgresql.production.conf
RUN chown -R postgres:postgres /etc/montagu
RUN ./docker-entrypoint.sh --version
RUN docker-entrypoint.sh --version

RUN cp /montagu-bin/create-users.sh /docker-entrypoint-initdb.d/

Expand Down
2 changes: 1 addition & 1 deletion bin/start-with-config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
set -ex
CONFIG_FILE=$1
shift
exec /docker-entrypoint.sh $* -c config_file=$CONFIG_FILE
exec docker-entrypoint.sh $* -c config_file=$CONFIG_FILE
4 changes: 2 additions & 2 deletions migrations/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
FROM openjdk:8-jre-alpine

RUN apk --no-cache add openssl
RUN apk add --no-cache bash

WORKDIR /flyway

ENV FLYWAY_VERSION 4.2.0
ENV FLYWAY_VERSION 8.5.10

RUN wget https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/${FLYWAY_VERSION}/flyway-commandline-${FLYWAY_VERSION}.tar.gz \
&& tar -xzf flyway-commandline-${FLYWAY_VERSION}.tar.gz \
&& mv flyway-${FLYWAY_VERSION}/* . \
&& rm flyway-commandline-${FLYWAY_VERSION}.tar.gz \
&& sed -i 's/bash/sh/' /flyway/flyway \
&& ln -s /flyway/flyway /usr/local/bin/flyway

COPY migrations/sql /sql
Expand Down