From b01126104d20f47e97d08b40502e59140517abbd Mon Sep 17 00:00:00 2001 From: Disassembler Date: Tue, 8 Mar 2022 12:01:01 +0100 Subject: [PATCH] Prepare for persistent volumes --- sahana-default/Dockerfile | 3 --- sahana-sambro/Dockerfile | 2 -- sahana-spotter/Dockerfile | 2 -- .../templates/Spotter/views/layout.html | 19 ++++++++----------- sahana/Dockerfile | 2 -- sahana/image.d/entrypoint.sh | 7 +++++++ 6 files changed, 15 insertions(+), 20 deletions(-) delete mode 100644 sahana-default/Dockerfile diff --git a/sahana-default/Dockerfile b/sahana-default/Dockerfile deleted file mode 100644 index 36fb271..0000000 --- a/sahana-default/Dockerfile +++ /dev/null @@ -1,3 +0,0 @@ -FROM sahana:latest - -VOLUME ["/srv/web2py/applications/eden/models"] diff --git a/sahana-sambro/Dockerfile b/sahana-sambro/Dockerfile index 68741b1..789fe59 100644 --- a/sahana-sambro/Dockerfile +++ b/sahana-sambro/Dockerfile @@ -5,5 +5,3 @@ COPY image.d / RUN \ # Change ownership of the newly copied files find /srv/web2py ! -user sahana -exec chown -R sahana:sahana {} + - -VOLUME ["/srv/web2py/applications/eden/models"] diff --git a/sahana-spotter/Dockerfile b/sahana-spotter/Dockerfile index 68741b1..789fe59 100644 --- a/sahana-spotter/Dockerfile +++ b/sahana-spotter/Dockerfile @@ -5,5 +5,3 @@ COPY image.d / RUN \ # Change ownership of the newly copied files find /srv/web2py ! -user sahana -exec chown -R sahana:sahana {} + - -VOLUME ["/srv/web2py/applications/eden/models"] diff --git a/sahana-spotter/image.d/srv/web2py/applications/eden/modules/templates/Spotter/views/layout.html b/sahana-spotter/image.d/srv/web2py/applications/eden/modules/templates/Spotter/views/layout.html index 586828f..52db78b 100644 --- a/sahana-spotter/image.d/srv/web2py/applications/eden/modules/templates/Spotter/views/layout.html +++ b/sahana-spotter/image.d/srv/web2py/applications/eden/modules/templates/Spotter/views/layout.html @@ -1,5 +1,5 @@ -{{# class="no-js" needed for modernizr }} + {{theme_styles=response.s3.theme_styles}} {{# Always force latest IE rendering engine (even in intranet) & Chrome Frame }} @@ -52,17 +52,14 @@ {{else:}}
-
- {{=current.menu.main}} -
+ {{=current.menu.main}}
-
+
{{if current.menu.options is not None:}} - {{=T("Show Options")}} - +
{{else:}}
@@ -81,13 +78,13 @@
-