From b7de7690a30063861948fe2dbac58deb34f96f01 Mon Sep 17 00:00:00 2001 From: Rub21 Date: Tue, 16 Apr 2024 18:47:16 -0500 Subject: [PATCH 1/4] Update postgres version from 11 to 14 --- compose/web.yml | 20 ++++++++++---------- images/db/Dockerfile | 17 ++++++----------- 2 files changed, 16 insertions(+), 21 deletions(-) diff --git a/compose/web.yml b/compose/web.yml index e825d9b6..b44e5727 100644 --- a/compose/web.yml +++ b/compose/web.yml @@ -11,16 +11,16 @@ services: volumes: - ./data/db-data:/var/lib/postgresql/data env_file: - - ./.env.web - web: - image: osmseed-web:v1 - build: - context: ./../images/web - dockerfile: Dockerfile - ports: - - '80:80' - env_file: - - ./.env.web + - ./../envs/.env.web + # web: + # image: osmseed-web:v1 + # build: + # context: ./../images/web + # dockerfile: Dockerfile + # ports: + # - '80:80' + # env_file: + # - ./../envs/.env.web ####### Enable for development mode # volumes: # - ./../../ohm-website:/var/www diff --git a/images/db/Dockerfile b/images/db/Dockerfile index c17d1038..158f9b85 100644 --- a/images/db/Dockerfile +++ b/images/db/Dockerfile @@ -1,16 +1,11 @@ -FROM postgres:11 -RUN rm /etc/apt/sources.list.d/pgdg.list -RUN sed -i s/deb.debian.org/archive.debian.org/g /etc/apt/sources.list -RUN sed -i 's|security.debian.org|archive.debian.org|g' /etc/apt/sources.list -RUN sed -i '/stretch-updates/d' /etc/apt/sources.list -RUN apt-get update && apt-get -y install apt-transport-https -RUN echo "deb [ signed-by=/usr/local/share/keyrings/postgres.gpg.asc ] https://apt-archive.postgresql.org/pub/repos/apt/ stretch-pgdg main 11" >/etc/apt/sources.list.d/pgdg.list -RUN apt-get update && apt-get install -y \ - postgresql-server-dev-11 \ +FROM postgres:14 +RUN apt-get update \ + && apt-get install -y \ + postgresql-server-dev-14 \ make \ build-essential \ - postgresql-11-postgis-2.5 && \ - apt-get clean && rm -rf /var/lib/apt/lists/* + postgresql-14-postgis-3 \ + && apt-get clean && rm -rf /var/lib/apt/lists/* ADD functions/functions.sql /usr/local/share/osm-db-functions.sql ADD docker_postgres.sh /docker-entrypoint-initdb.d/ From 96821a7e301d56039906624f753b7c4a363aba71 Mon Sep 17 00:00:00 2001 From: Rub21 Date: Thu, 18 Apr 2024 10:52:08 -0500 Subject: [PATCH 2/4] Update path for env vars - development --- compose/web.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/compose/web.yml b/compose/web.yml index b44e5727..e240b62a 100644 --- a/compose/web.yml +++ b/compose/web.yml @@ -12,15 +12,15 @@ services: - ./data/db-data:/var/lib/postgresql/data env_file: - ./../envs/.env.web - # web: - # image: osmseed-web:v1 - # build: - # context: ./../images/web - # dockerfile: Dockerfile - # ports: - # - '80:80' - # env_file: - # - ./../envs/.env.web - ####### Enable for development mode - # volumes: - # - ./../../ohm-website:/var/www + web: + image: osmseed-web:v1 + build: + context: ./../images/web + dockerfile: Dockerfile + ports: + - '80:80' + env_file: + - ./../envs/.env.web +####### Enable for development mode +# volumes: +# - ./../../ohm-website:/var/www From 48cede685933463c3b35e6d8ced1e561f470571f Mon Sep 17 00:00:00 2001 From: Rub21 Date: Thu, 18 Apr 2024 11:00:08 -0500 Subject: [PATCH 3/4] Update the EBS volume that contains the migration data --- values.staging.template.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/values.staging.template.yaml b/values.staging.template.yaml index bcf29235..8998836b 100644 --- a/values.staging.template.yaml +++ b/values.staging.template.yaml @@ -79,7 +79,7 @@ osm-seed: mountPath: /var/lib/postgresql/data subPath: postgresql-db # In case cloudProvider: aws - AWS_ElasticBlockStore_volumeID : {{STAGING_DB_EBS}} + AWS_ElasticBlockStore_volumeID : vol-07a175d4e92732c1 AWS_ElasticBlockStore_size: 200Gi resources: enabled: false From 6410929c3edf2f81df47ea671edad53f28abf489 Mon Sep 17 00:00:00 2001 From: Rub21 Date: Thu, 18 Apr 2024 17:46:50 -0500 Subject: [PATCH 4/4] Update ebs from migration --- values.staging.template.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/values.staging.template.yaml b/values.staging.template.yaml index 8998836b..7f4cc57a 100644 --- a/values.staging.template.yaml +++ b/values.staging.template.yaml @@ -79,7 +79,7 @@ osm-seed: mountPath: /var/lib/postgresql/data subPath: postgresql-db # In case cloudProvider: aws - AWS_ElasticBlockStore_volumeID : vol-07a175d4e92732c1 + AWS_ElasticBlockStore_volumeID : vol-08e9a73c3c0f2855c AWS_ElasticBlockStore_size: 200Gi resources: enabled: false