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

DB migration postgres 11 to 14 #293

Merged
merged 36 commits into from
May 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
b7de769
Update postgres version from 11 to 14
Rub21 Apr 16, 2024
f2a060f
Merge branch 'staging' into api-db/update
Rub21 Apr 18, 2024
96821a7
Update path for env vars - development
Rub21 Apr 18, 2024
48cede6
Update the EBS volume that contains the migration data
Rub21 Apr 18, 2024
6410929
Update ebs from migration
Rub21 Apr 18, 2024
5433db0
Merge pull request #291 from OpenHistoricalMap/api-db/update
Rub21 Apr 18, 2024
31b56d4
Set up settings-local.yml
Rub21 Apr 19, 2024
8f8f718
Merge pull request #292 from OpenHistoricalMap/settings/web
Rub21 Apr 19, 2024
71e84de
Update env vars for DB
Rub21 Apr 19, 2024
586e825
Add postgresql.conf to customize values in postgres
Rub21 Apr 22, 2024
4119092
Update osm-seed version
Rub21 Apr 22, 2024
fd3cb84
Update ebs staging disk
Rub21 Apr 23, 2024
286e95c
Update cronjob for taginfo
Rub21 Apr 23, 2024
cd6f4ed
Merge branch 'main' into staging
Rub21 Apr 24, 2024
900cb82
Test replication files from new API DB
Rub21 Apr 25, 2024
642ea2e
Update tiler EBS - staging, to test new API DB
Rub21 Apr 25, 2024
039c4d7
Update postgres config for staging and production
Rub21 Apr 26, 2024
3ed7e4c
Update osm-seed version and env vars
Rub21 Apr 26, 2024
fa126f6
Update ebs for tiler and use prod replication files
Rub21 Apr 26, 2024
8db15a2
Disable osmcha - staging
Rub21 Apr 26, 2024
7d4e6f8
Test PBF planet files from latest api-db
Rub21 Apr 26, 2024
a9f0f0c
Update imposm SEQUENCE_NUMBER - staging
Rub21 Apr 26, 2024
5488b1e
Update resources for staging tiler
Rub21 Apr 29, 2024
92d19d0
Update Dockerfile
erictheise Apr 29, 2024
6496b14
Update osm-seed version taginfo
Rub21 Apr 30, 2024
737d571
Merge from main
Rub21 Apr 30, 2024
2fe67a0
Update tiler to displaywaterbody in lower zoom
Rub21 Apr 30, 2024
efd9625
Add natural earth - water lakes for tiler
Rub21 Apr 30, 2024
90f7fb0
Natural Earth provider/water-areas zoom 0-10
Rub21 May 1, 2024
ce2ebce
Update cronjob resource for taginfo-staging
Rub21 May 1, 2024
ac4f051
Update osm-seed version
Rub21 May 2, 2024
402e4c9
Set read_only mode for website - staging
Rub21 May 2, 2024
053ffea
Update settings.yml for key oauth - staging
Rub21 May 2, 2024
c4aa185
Set WEBSITE_STATUS in settings.yml
Rub21 May 2, 2024
eefcb00
Update setting-local website status
Rub21 May 2, 2024
daa10f4
Update EBS volume id for production api
Rub21 May 2, 2024
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
14 changes: 7 additions & 7 deletions compose/web.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: '3.8'
services:
db:
platform: linux/amd64
image: osmseed-db:v1
image: ohm-db:v2
build:
context: ./../images/db
dockerfile: Dockerfile
Expand All @@ -11,16 +11,16 @@ services:
volumes:
- ./data/db-data:/var/lib/postgresql/data
env_file:
- ./.env.web
- ./../envs/.env.web
web:
image: osmseed-web:v1
image: ohm-web:v1
build:
context: ./../images/web
dockerfile: Dockerfile
ports:
- '80:80'
env_file:
- ./.env.web
####### Enable for development mode
# volumes:
# - ./../../ohm-website:/var/www
- ./../envs/.env.web
####### Enable for development mode
# volumes:
# - ./../../ohm-website:/var/www
22 changes: 10 additions & 12 deletions images/db/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,24 +1,22 @@
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/
RUN mkdir -p db
RUN mkdir -p lib
ADD functions/ db/functions/
ADD lib/quad_tile/ lib/quad_tile/

RUN make -C db/functions/
RUN chown -R postgres lib/
RUN chown -R postgres db/
COPY start.sh /usr/local/bin/
COPY config/postgresql.*.conf /etc/postgresql/

CMD ["/usr/local/bin/start.sh"]
Loading
Loading