diff --git a/README.md b/README.md index 07de7ffe4060d5a49416ed3c42b44a8fed6962c3..72357259eb7c7bfb8cfe2d5d2c4683d575bb605a 100644 --- a/README.md +++ b/README.md @@ -4,23 +4,34 @@ LDV Specification Application. For filling ATDB-LDV with processing tasks for LO ## Getting started +## Collaborate + * create `your branch` from `main` + * add your functionality + * test your functionality locally + + * merge `main` into `your branch` before creating a MR + * merge with `main` + * deploy in test, and test it + * deploy in production, and test it + + ## Test Environment * https://sdc-dev.astron.nl/ldvspec/ ## Production Environment - * https://sdc-dev.astron.nl/ldvspec/ - + * https://sdc.astron.nl/ldvspec/ -- [ ] [Create](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#create-a-file) or [upload](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#upload-a-file) files -- [ ] [Add files using the command line](https://docs.gitlab.com/ee/gitlab-basics/add-file.html#add-a-file-using-the-command-line) or push an existing Git repository with the following command: -``` -cd existing_repo -git remote add origin https://git.astron.nl/astron-sdc/ldv-specification.git -git branch -M main -git push -uf origin main -``` +## Build & Deploy +The CI/CD pipeline creates 2 Docker containers: + * ldv-specification : The Django application + * ldv-spec-postgres : The Postgres database + + The database can also be accessed externally: + * host : sdc-dev.astron.nl + * port : 12000 + * database: ldv-spec-db ## Collaborate with your team @@ -33,15 +44,5 @@ git push -uf origin main ## Test and Deploy -## Howto -### migrate database manually - -- exec into the container - -``` -cd /src -python manage.py migrate --settings=ldvspec.settings.docker_sdc - -``` *** diff --git a/ldvspec/lofardata/templates/lofardata/base.html b/ldvspec/lofardata/templates/lofardata/base.html index b19e5fcea7982a304b2972488aeec9a3e030d791..020485dbd2f2b26f6a02a1d29810b4ed0e731bb7 100644 --- a/ldvspec/lofardata/templates/lofardata/base.html +++ b/ldvspec/lofardata/templates/lofardata/base.html @@ -12,9 +12,9 @@ <title>{% block myBlockTitle %}LDV Specification{% endblock %}</title> <!-- loads the path to static files --> - <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css"> <link href='https://fonts.googleapis.com/css?family=Raleway' rel='stylesheet' type='text/css'> <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/js/bootstrap.min.js" integrity="sha384-ChfqqxuZUCnJSK3+MXmPNIyE6ZbWh2IMqE241rYiqJxyMiZ6OW/JmZQ5stwEULTy" crossorigin="anonymous"></script> + <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css"> <link rel="stylesheet" type="text/css" href="{% static 'lofardata/style.css' %}"/> <link rel="icon" href="{% static 'favicon.ico' %}"> diff --git a/ldvspec/lofardata/templates/lofardata/index.html b/ldvspec/lofardata/templates/lofardata/index.html index ffd4bb840cc34d0f8a6c02f6178639ecf4796b5f..8f726a1182e84a74a4e6099b0e3729842b5ce6b2 100644 --- a/ldvspec/lofardata/templates/lofardata/index.html +++ b/ldvspec/lofardata/templates/lofardata/index.html @@ -5,19 +5,19 @@ <div class="container-fluid details-container"> - <div class="row"> - <Table> - <tr> - <td>atdb_host</td><td>{{ atdb_host }}</td> - </tr> - <tr> - <td>lofardata api</td><td><a href="{% url 'lofardata' %}">{% url 'lofardata' %}</a></td> - </tr> - </Table> - </div> - <p class="footer"> Version 1.0.0 (15 jul 2022 - 12:00) + <table class="table table-striped table-bordered table-sm"> + + <tbody> + <tr><td>atdb_host</td><td>{{ atdb_host }}</td></tr> + <tr><td>api</td><td><a href="{% url 'lofardata' %}">{% url 'lofardata' %}</a></td></tr> + </tbody> + + </table> + <p class="footer"> Version 1.0.0 (15 jul 2022 - 14:00) </div> + + {% endblock %}