From 85ce10b314246e5635965641ca541903bcb145e0 Mon Sep 17 00:00:00 2001
From: Nico Vermaas <vermaas@astron.nl>
Date: Fri, 15 Jul 2022 11:02:37 +0200
Subject: [PATCH] configuring docker
---
ldvspec/docker/docker-compose-dev-cd.yml | 4 ++--
ldvspec/lofardata/templates/lofardata/base.html | 1 +
ldvspec/lofardata/templates/lofardata/index.html | 12 +++++++++---
3 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/ldvspec/docker/docker-compose-dev-cd.yml b/ldvspec/docker/docker-compose-dev-cd.yml
index 877b3d15..ab1560ba 100644
--- a/ldvspec/docker/docker-compose-dev-cd.yml
+++ b/ldvspec/docker/docker-compose-dev-cd.yml
@@ -12,9 +12,9 @@ services:
image: postgres:14
container_name: ldv-spec-postgres
expose:
+ - 5432
+ ports:
- 12000:5432
- #ports:
- # - "5432:5432"
networks:
- traefik_proxy
- ldv_network
diff --git a/ldvspec/lofardata/templates/lofardata/base.html b/ldvspec/lofardata/templates/lofardata/base.html
index 6c0460fa..b19e5fce 100644
--- a/ldvspec/lofardata/templates/lofardata/base.html
+++ b/ldvspec/lofardata/templates/lofardata/base.html
@@ -14,6 +14,7 @@
<!-- 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" 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 8f9800dc..80cf8370 100644
--- a/ldvspec/lofardata/templates/lofardata/index.html
+++ b/ldvspec/lofardata/templates/lofardata/index.html
@@ -6,10 +6,16 @@
<div class="container-fluid details-container">
<div class="row">
- <h5>atdb_host = {{ atdb_host }}</h5>
- <h5>http://localhost:8000/ldvspec/lofardata/</h5>
+ <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 - 10:00)
+ <p class="footer"> Version 1.0.0 (15 jul 2022 - 11:00)
</div>
--
GitLab