diff --git a/compose/web.yml b/compose/web.yml index e825d9b6..e240b62a 100644 --- a/compose/web.yml +++ b/compose/web.yml @@ -11,7 +11,7 @@ services: volumes: - ./data/db-data:/var/lib/postgresql/data env_file: - - ./.env.web + - ./../envs/.env.web web: image: osmseed-web:v1 build: @@ -20,7 +20,7 @@ services: 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 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/ diff --git a/values.staging.template.yaml b/values.staging.template.yaml index bcf29235..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 : {{STAGING_DB_EBS}} + AWS_ElasticBlockStore_volumeID : vol-08e9a73c3c0f2855c AWS_ElasticBlockStore_size: 200Gi resources: enabled: false