Merge branch 'main' of github.com:openaq/openaq-db

Dockerfile

@@ -1,10 +1,10 @@
-FROM postgis/postgis:14-3.4 as pg
+FROM postgis/postgis:16-3.4 as pg
 
 LABEL maintainer="OpenAQ"
 
 # defaults that may be overwritten by env
 ENV POSTGIS_MAJOR 3
-ENV POSTGRESQL_MAJOR 14
+ENV POSTGRESQL_MAJOR 16
 ENV PGUSER postgres
 ENV PGDATABASE postgres
 ENV PGHOST localhost
@@ -24,6 +24,7 @@ EXPOSE 5432
  # Docker image will automatically run scripts in `/docker-entrypoint-initdb.d`
  RUN mkdir -p /docker-entrypoint-initdb.d \
      && echo "#!/bin/bash" >/docker-entrypoint-initdb.d/001_initdb.sh \
-     && echo "/openaqdb/init.sh" >> /docker-entrypoint-initdb.d/001_initdb.sh
+     && echo "/openaqdb/init.sh" >> /docker-entrypoint-initdb.d/001_initdb.sh \
+     && echo "/openaqdb/mock.sh" >> /docker-entrypoint-initdb.d/001_initdb.sh
 
 WORKDIR /openaqdb

migra/README.md

@@ -41,7 +41,7 @@ REMOTE_DATABASE_URL=postgresql://user:pwd@host:port/openaq
 ```
 
 ```sh
-ENV=docker python3 compare.py
+DOTENV=.env.docker python3 compare.py
 ```
 
 ## Notes

migra/compare.py

@@ -21,6 +21,6 @@
     m.add_all_changes(privileges=False)
 
     sql = m.sql.encode('utf8')
-    with open(f'migra/patches/patch_{today}_chk.sql', 'w') as f:
+    with open(f'migra/patches/patch_{today}.sql', 'w') as f:
         for statement in m.statements:
             f.write(f"----------------\n{statement}\n")