Skip to content
Snippets Groups Projects
Commit 87335e44 authored by Nico Vermaas's avatar Nico Vermaas
Browse files

adding documentation

parent 27682506
No related branches found
No related tags found
No related merge requests found
Pipeline #7275 passed
...@@ -24,6 +24,8 @@ Currently they are still mostly the original ATDB diagrams. They will be adapted ...@@ -24,6 +24,8 @@ Currently they are still mostly the original ATDB diagrams. They will be adapted
Datamodel: Datamodel:
* https://drive.google.com/file/d/1v5hMBQS0jT8DQJwySVISfRa1zF4o0fCQ/view?usp=sharing * https://drive.google.com/file/d/1v5hMBQS0jT8DQJwySVISfRa1zF4o0fCQ/view?usp=sharing
![](atdb/docs/ATDB-LDV%20Data%20Model.png)
Workflow/Status Diagram: Workflow/Status Diagram:
* https://drive.google.com/file/d/1BCrIwUfacOVqSN73VIIjUuBCXNYA67iK/view?usp=sharing * https://drive.google.com/file/d/1BCrIwUfacOVqSN73VIIjUuBCXNYA67iK/view?usp=sharing
...@@ -32,6 +34,8 @@ Workflow/Status Diagram: ...@@ -32,6 +34,8 @@ Workflow/Status Diagram:
Deployment Diagram: Deployment Diagram:
* https://drive.google.com/file/d/1_j9Fp505pZTxcmzAEdgftdPkoIFrKfAX/view?usp=sharing * https://drive.google.com/file/d/1_j9Fp505pZTxcmzAEdgftdPkoIFrKfAX/view?usp=sharing
![](atdb/docs/ATDB-LDV%20-%20Deployment%20Diagram.png)
### Manual deploy in Docker ### Manual deploy in Docker
For the `master' branch there is a CI/CD pipeline in place which builds and deploys the backend at https://sdc.astron.nl:5554/atdb/ For the `master' branch there is a CI/CD pipeline in place which builds and deploys the backend at https://sdc.astron.nl:5554/atdb/
The deploy step requires pushing the 'play' button in the gitlab pipelines section. The deploy step requires pushing the 'play' button in the gitlab pipelines section.
...@@ -74,7 +78,7 @@ This is how to do that manually for a persistent database in a Docker container. ...@@ -74,7 +78,7 @@ This is how to do that manually for a persistent database in a Docker container.
### Original ATDB diagrams ### Original ATDB diagrams
These diagrams can be used as guidance to the original ATDB services, which can be harvested for functionality These diagrams can be used as inspiration and guidance to the original ATDB services, which can be harvested for functionality.
![](atdb/docs/ATDB%20Context%20Diagram.png) ![](atdb/docs/ATDB%20Context%20Diagram.png)
......
...@@ -12,22 +12,7 @@ RUN \ ...@@ -12,22 +12,7 @@ RUN \
pip install -r requirements/prod.txt && \ pip install -r requirements/prod.txt && \
apk --purge del .build-deps apk --purge del .build-deps
# collect static files
# RUN exec python manage.py collectstatic --settings=atdb.settings.docker_sdc --noinput
# run gunicorn # run gunicorn
CMD exec gunicorn atdb.wsgi_docker_sdc:application --bind 0.0.0.0:8000 --workers 3 CMD exec gunicorn atdb.wsgi_docker_sdc:application --bind 0.0.0.0:8000 --workers 3
# build the image like this:
# docker build -t atdb-ldv:latest .
# run the container from here, like this:
# docker run -d --name atdb-ldv -p 8010:8000 --restart always atdb-ldv:latest
# log into the container
# docker exec -it atdb-ldv sh
# tail logs
# docker exec -it atdb-ldv tail -f logs/atdb.log
atdb/docs/ATDB-LDV - Deployment Diagram.png

59.6 KiB

atdb/docs/ATDB-LDV Data Model.png

60.9 KiB

...@@ -82,7 +82,7 @@ class Observation(TaskObject): ...@@ -82,7 +82,7 @@ class Observation(TaskObject):
field_dec = models.FloatField('field_dec', null = True) field_dec = models.FloatField('field_dec', null = True)
skip_auto_ingest = models.BooleanField(default=False) skip_auto_ingest = models.BooleanField(default=False)
progress = models.CharField(max_length=40, default="", null=True) progress = models.CharField(max_length=40, default="0%", null=True, blank=True)
# this translates a view-name (from urls.py) back to a url, to avoid hardcoded url's in the html templates # this translates a view-name (from urls.py) back to a url, to avoid hardcoded url's in the html templates
# bad : <td><a href="/atdb/observations/{{ observation.id }}/" target="_blank">{{ observation.taskID }} </a> </td> # bad : <td><a href="/atdb/observations/{{ observation.id }}/" target="_blank">{{ observation.taskID }} </a> </td>
......
...@@ -57,5 +57,5 @@ class ObservationSerializer(serializers.ModelSerializer): ...@@ -57,5 +57,5 @@ class ObservationSerializer(serializers.ModelSerializer):
'generated_dataproducts', 'generated_dataproducts',
'data_location', 'node', 'data_location', 'node',
'skip_auto_ingest','observing_mode', 'skip_auto_ingest','observing_mode',
'quality','progress') 'quality','metadata','progress')
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment