[FIX] Revert postgres update (#3443)

* Revert postgres update

* un-revert migration fix

Author: sggerard

Makefile

@@ -110,27 +110,6 @@ cleandb:
 	@docker volume rm mds_postgres_data -f
 	@docker compose $(DC_FILE) up -d postgres flyway
 
-updatedb:
-	@echo "+\n++ Updating database from postgres 13 to 16"
-	@echo "+\n++ Stopping postgres"
-	@docker compose $(DC_FILE) stop postgres flyway
-	@if docker volume ls -q | grep -q "mds_postgres_data_bkp"; then \
-		echo "+\n++ Backup volume 'mds_postgres_data_bkp' already exists"; \
-	else \
-		echo "+\n++ Creating a backup volume"; \
-		docker volume create --name mds_postgres_data_bkp --label com.docker.compose.project=mds --label com.docker.compose.volume=postgres_data_bkp; \
-		docker run --rm -it -v mds_postgres_data:/from -v mds_postgres_data_bkp:/to alpine ash -c 'cd /from ; cp -av . /to'; \
-	fi
-	@echo "+\n++ Backup complete, wiping mds_postgres_data volume"
-	@docker run --rm -v mds_postgres_data:/tmp alpine sh -c "rm -rf /tmp/*"
-	@echo "+\n++ Updating postgres and copying result to the mds_postgres_data volume"
-	@docker compose $(DC_FILE) up postgres_update
-	@echo "+\n++ Deleting old postgres image & update image"
-	@docker compose $(DC_FILE) rm -f -v -s postgres postgres_update
-	@docker rmi -f mds-postgres
-	@echo "+\n++ Starting new postgres image"
-	@docker compose $(DC_FILE) up -d postgres flyway
-
 reglogin:
 	@echo "+\n++ Initiating Openshift registry login...\n+"
 	@./bin/registry-login.sh

docker-compose.M1.yaml

@@ -64,32 +64,12 @@ services:
     ports:
       - "5432:5432"
     volumes:
-      - ./services/postgres/postgresql.conf:/config/postgresql.conf
-      - ./services/postgres/pg_hba.conf:/config/pg_hba.conf
       - postgres_data:/var/lib/postgresql/data
-    command:
-      postgres -c 'config_file=/config/postgresql.conf' -c 'hba_file=/config/pg_hba.conf'
     healthcheck:
       test: [ "CMD", "pg_isready" ]
       interval: 5s
       timeout: 5s
       retries: 5
-    stop_grace_period: 30s
-
-  postgres_update:
-    platform: linux/amd64
-    container_name: mds_postgres_update
-    user: postgres
-    build:
-      context: services/postgres
-      dockerfile: Dockerfile_update
-    environment:
-    - PGUSER=mds
-    - POSTGRES_PASSWORD=test
-    - POSTGRES_INITDB_ARGS=-U mds
-    volumes:
-    - postgres_data_bkp:/var/lib/postgresql/13/data
-    - postgres_data:/var/lib/postgresql/16/data
 
   ####################### Flyway Migration Definition #######################
   flyway:
@@ -346,7 +326,6 @@ networks:
 ####################### Volumes Definition #######################
 volumes:
   postgres_data: {}
-  postgres_data_bkp: {}
   core_api_logs: {}
   core_web_logs: {}
   document_manager_logs: {}

docker-compose.ci.yaml

@@ -63,7 +63,6 @@ services:
       interval: 5s
       timeout: 5s
       retries: 10
-    stop_grace_period: 30s
 
   ####################### Flyway Migration Definition #######################
   flyway:

docker-compose.yaml

@@ -63,30 +63,12 @@ services:
     ports:
       - "5432:5432"
     volumes:
-      - ./services/postgres/postgresql.conf:/config/postgresql.conf
-      - ./services/postgres/pg_hba.conf:/config/pg_hba.conf
       - postgres_data:/var/lib/postgresql/data
-    command:
-      postgres -c 'config_file=/config/postgresql.conf' -c 'hba_file=/config/pg_hba.conf'
     healthcheck:
       test: [ "CMD", "pg_isready" ]
       interval: 5s
       timeout: 5s
       retries: 5
-  
-  postgres_update:
-    container_name: mds_postgres_update
-    user: postgres
-    build:
-      context: services/postgres
-      dockerfile: Dockerfile_update
-    environment:
-    - PGUSER=mds
-    - POSTGRES_PASSWORD=test
-    - POSTGRES_INITDB_ARGS=-U mds
-    volumes:
-    - postgres_data_bkp:/var/lib/postgresql/13/data
-    - postgres_data:/var/lib/postgresql/16/data
 
   ####################### Flyway Migration Definition #######################
   flyway:
@@ -350,7 +332,6 @@ networks:
 ####################### Volumes Definition #######################
 volumes:
   postgres_data: {}
-  postgres_data_bkp: {}
   core_api_logs: {}
   core_web_logs: {}
   document_manager_logs: {}

migrations/Dockerfile.flyway.ci

@@ -1,4 +1,4 @@
-FROM flyway/flyway:11.1-alpine
+FROM flyway/flyway:7.14-alpine
 ENV FLYWAY_HOME=/flyway
 
 USER 0
@@ -10,7 +10,7 @@ COPY sql-prod/* /flyway/sql-prod/
 COPY scripts/* /flyway/scripts/
 
 
-ENV FLYWAY_VERSION=11.1
+ENV FLYWAY_VERSION=5.2.4
 
 # Copy over the SQL files and scripts
 COPY sql/* $FLYWAY_HOME/sql/

migrations/Dockerfile.flyway.dev

@@ -1,4 +1,4 @@
-FROM flyway/flyway:11.1-alpine
+FROM flyway/flyway:7.14-alpine
 
 USER root
 

services/postgres/Dockerfile

@@ -1,12 +1,12 @@
-FROM postgis/postgis:16-3.5
+FROM postgis/postgis:13-3.4
 
 # The Git ref (branch/tag) specifying the version of oracle-fdw to use
 # This is referencing a specific revision (master as of 2021.06.01)
 # because there is not a tagged version that works with the 
 # Oracle 21.x client libraries yet
 
-ARG ORACLE_FDW_VERSION=ORACLE_FDW_2_6_0
-ARG oracle_fdw_version=2_6_0
+ARG ORACLE_FDW_VERSION=3035e4453404a143b8154d7b77c6db793fad0e06
+ARG oracle_fdw_version=2_1_0
 ARG instantclient_version=21_6
 
 # =================================== # 
@@ -30,7 +30,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     unzip \
     wget \ 
     ca-certificates \ 
-    postgresql-server-dev-16 \ 
+    postgresql-server-dev-13 \ 
     libaio1 \
     libaio-dev
 
@@ -55,7 +55,7 @@ ENV LD_LIBRARY_PATH /pgexts/oraclelibs/instantclient_${instantclient_version}
 # =================================== # 
 
 RUN cd /pgexts && \
-    wget -nv https://github.com/laurenz/oracle_fdw/archive/refs/tags/${ORACLE_FDW_VERSION}.tar.gz && \
+    wget -nv https://github.com/laurenz/oracle_fdw/archive/${ORACLE_FDW_VERSION}.tar.gz && \
     tar -xzf ${ORACLE_FDW_VERSION}.tar.gz && \
     cd oracle_fdw-${ORACLE_FDW_VERSION} && \
     make && \
@@ -70,8 +70,8 @@ RUN rm -rf /pgexts/oraclelibs/*.zip /pgexts/${ORACLE_FDW_VERSION}.tar.gz /tmp/or
 # Init Scripts
 
 COPY init.sql /docker-entrypoint-initdb.d/init.sql
+COPY postgresql.conf      /tmp/postgresql.conf
+COPY updateConfig.sh      /docker-entrypoint-initdb.d/_updateConfig.sh
 
-RUN mkdir -p /pg_log
-RUN chown -R postgres:postgres /pg_log
-
-WORKDIR /docker-entrypoint-initdb.d
+# Set the working directory to container entrypoint
+WORKDIR /docker-entrypoint-initdb.d