Support docker compose version < 1.25.

README.md

@@ -12,11 +12,10 @@ git clone git@git.astron.nl:astron-sdc/esap-db.git
 cd esap-db
 ```
 
-add this .env file in the host-files directory:
+add this .env file in the current directory (`esap-db`):
 
 ```
 DOMAIN=localhost
-OIDC_RP_CLIENT_SECRET=********
 DBADMIN_USER=postgres
 DBADMIN_PASSWORD=postgres
 DBPROJECT_USER=postgres
@@ -67,7 +66,7 @@ curl -XPOST \
   }'
 ```
 
-Once the project and the dataset are created, we can store the result of an ESAP-API query into a table that belongs to the dataset that we have just created.
+Then, we can store the result of an ESAP-API query into a table that belongs to the dataset that we have just created.
 ```bash
 curl -X 'POST' \
   'http://localhost:8001/api/v0/projects/my_project/esap-gateway-operations' \
@@ -90,6 +89,6 @@ curl -X 'POST' \
 The new table `apertif_query` can be exported as JSON:
 ```bash
 curl -X 'GET' \
-  'http://localhost:8001/api/v0/projects/my_project/datasets/my_dataset/tables/apertif_query/content' \
+  'http://localhost:8001/api/v0/projects/my_project/datasets/my_dataset/tables/apertif_table/content' \
   -H 'accept: application/json'
 ```

app/db/models.py

@@ -2,8 +2,6 @@
 from sqlalchemy import BigInteger, Boolean, Column, ForeignKey, Integer, String
 from sqlalchemy.orm import declarative_base
 
-# from sqlalchemy.dialects.postgresql import BIGINT as BigInteger
-
 Base = declarative_base()
 
 

host-files/run.sh

@@ -9,7 +9,7 @@ DOMAIN=backend \
 SMTP_HOST="" \
 TRAEFIK_PUBLIC_NETWORK_IS_EXTERNAL=false \
 INSTALL_DEV=true \
-docker-compose -f ${ESAP_DB_PATH}/docker-compose.yml --env-file ${ESAP_DB_PATH}/.env config > ${ESAP_DB_PATH}/docker-stack.yml
+docker-compose -f ${ESAP_DB_PATH}/docker-compose.yml config > ${ESAP_DB_PATH}/docker-stack.yml
 
 docker-compose -f ${ESAP_DB_PATH}/docker-stack.yml build
 docker-compose -f ${ESAP_DB_PATH}/docker-stack.yml down -v --remove-orphans # Remove possibly previous broken stacks left hanging after an error