diff --git a/README.md b/README.md index cccf6ac986161119f55122e146d6c49ddec76c31..4c7104d259cab899652b69cd2deb4948ce936e4f 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,7 @@ LDV Specification Application. For filling ATDB-LDV with processing tasks for LO - https://drive.google.com/file/d/1_j9Fp505pZTxcmzAEdgftdPkoIFrKfAX/view?usp=sharing ## Collaborate + * create `your branch` from `main` * add your functionality * test your functionality locally @@ -20,11 +21,72 @@ LDV Specification Application. For filling ATDB-LDV with processing tasks for LO * deploy in production, and test it ### Local update -After a collegue has made changes, then locally - * git pull - * pip install -r requirements\dev.tx - * python manage.py migrate --settings=ldvspec.settings.dev +After a collegue has made changes, then locally: +``` + > git pull + > pip install -r requirements\dev.txt + > python manage.py migrate --settings=ldvspec.settings.dev +``` + +## Local Development Environment + +### Postgres Database in Docker + +Run `docker-compose up -d` with the following compose file to spin up a new Postgres container. +See the `docker-compose-postgres-dev.yml` file in the `docker` directory. +(not that port 5433 is used. You can change that at will, but then also change it in `dev.py`) +```yaml + +version: "3.7" +services: + + ldv-spec-db: + image: postgres:14 + container_name: ldv-spec-postgres + expose: + - 5433 + ports: + - 5433:5432 + environment: + POSTGRES_PASSWORD: "secret" + POSTGRES_USER: "postgres" + POSTGRES_DB: "ldv-spec-db" + volumes: + - ldv-spec-db:/var/lib/postgresql/data + restart: always + +volumes: + ldv-spec-db: +``` + +### Django Application + * clone the repo + * open the project in Pycharm + * create a venv (File -> Settings -> Project -> Project Interpreter -> (click cog) -> add) + * pip install -r requirements\dev.txt + * check and/or change the database connection in settings/dev/py. In this example it connects to a database server on 'raspiastro', + you have to change that to the server where you run your Postgres Docker container (localhost?) + +```python +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.postgresql_psycopg2', + 'USER': 'postgres', + 'PASSWORD': 'secret', + 'NAME': 'ldv-spec-db', + 'HOST': 'raspiastro', + 'PORT': '5433', + }, +} +``` + +``` + > python manage.py migrate --settings=ldvspec.settings.dev + > python manage.py runserver --settings=ldvspec.settings.dev + > python manage.py createsuperuser --settings=ldvspec.settings.dev +``` + ## Test Environment * https://sdc-dev.astron.nl/ldvspec/ diff --git a/ldvspec/docker/docker-compose-postgres-dev.yml b/ldvspec/docker/docker-compose-postgres-dev.yml new file mode 100644 index 0000000000000000000000000000000000000000..c8a3fa547ae2a4a5de08c6b3c091d9a2a413aa95 --- /dev/null +++ b/ldvspec/docker/docker-compose-postgres-dev.yml @@ -0,0 +1,22 @@ +version: "3.7" +services: + + ldv-spec-db: + image: postgres:14 + container_name: ldv-spec-postgres + expose: + - 5433 + ports: + - 5433:5432 + env_file: + - $HOME/shared/ldvspec.env + environment: + POSTGRES_PASSWORD: "secret" + POSTGRES_USER: "postgres" + POSTGRES_DB: "ldv-spec-db" + volumes: + - ldv-spec-db:/var/lib/postgresql/data + restart: always + +volumes: + ldv-spec-db: \ No newline at end of file diff --git a/ldvspec/ldvspec/settings/dev.py b/ldvspec/ldvspec/settings/dev.py index 6abeb007aa13b0c07a87cc74e16db6af2fa4f1f3..afbb1c5a4063162b85c2d012aff8375643d1ee06 100644 --- a/ldvspec/ldvspec/settings/dev.py +++ b/ldvspec/ldvspec/settings/dev.py @@ -10,11 +10,11 @@ CORS_ORIGIN_ALLOW_ALL = True DATABASES = { 'default': { 'ENGINE': 'django.db.backends.postgresql_psycopg2', - 'USER': 'atdb_admin', - 'PASSWORD': 'atdb123', + 'USER': 'postgres', + 'PASSWORD': 'secret', 'NAME': 'ldv-spec-db', - 'HOST': 'localhost', - 'PORT': '5432', + 'HOST': 'raspiastro', + 'PORT': '5433', }, } diff --git a/ldvspec/lofardata/templates/lofardata/index.html b/ldvspec/lofardata/templates/lofardata/index.html index 534bfbc0899a7e9b794150865f9e865abb1865ea..8e7e2bd23e32c89c5aa5dee2ee3df8e1f84ca75f 100644 --- a/ldvspec/lofardata/templates/lofardata/index.html +++ b/ldvspec/lofardata/templates/lofardata/index.html @@ -16,7 +16,7 @@ </tbody> </table> - <p class="footer"> Version 1.0.0 (25 jul 2022 - 8:00) + <p class="footer"> Version 1.0.0 (26 jul 2022 - 13:00) </div>