Mercurial > dive4elements > river

changeset 9749:68c6fe74a276 3.2.x

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Allow changing CGI scripts without re-building This is more in line with the fact, that the mapfile path is also configurable in artifact server.
author Tom Gottfried <tom@intevation.de>
date Thu, 22 Sep 2022 16:37:32 +0200
parents edaae6f76fc7
children 432934cda171
files docker/Dockerfile.mapserv docker/docker-compose.yml docker/mapserver/cgi-bin/river-wms docker/mapserver/cgi-bin/user-wms docker/river-wms docker/user-wms
diffstat 6 files changed, 12 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/docker/Dockerfile.mapserv	Mon Sep 12 16:13:54 2022 +0200
+++ b/docker/Dockerfile.mapserv	Thu Sep 22 16:37:32 2022 +0200
@@ -42,8 +42,7 @@
 VOLUME /opt/d4e/bin
 
 # CGI scripts
-ADD river-wms /var/www/cgi-bin/
-ADD user-wms /var/www/cgi-bin/
+ADD mapserver/cgi-bin /var/www/cgi-bin
 
 # httpd config
 ADD httpd-mapserver.conf /etc/httpd/conf.d/
--- a/docker/docker-compose.yml	Mon Sep 12 16:13:54 2022 +0200
+++ b/docker/docker-compose.yml	Thu Sep 22 16:37:32 2022 +0200
@@ -33,6 +33,7 @@
       - db
       - server
     volumes:
+      - ./mapserver/cgi-bin:/var/www/cgi-bin
       - mapfiles:/opt/d4e/bin
     ports:
       - 8081:80
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/docker/mapserver/cgi-bin/river-wms	Thu Sep 22 16:37:32 2022 +0200
@@ -0,0 +1,5 @@
+#!/bin/sh
+export LC_ALL="de_DE.UTF-8"
+export NLS_LANG=".AL32UTF8"
+export MS_MAPFILE=/opt/d4e/bin/rivers.map
+/opt/mapserver/mapserv
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/docker/mapserver/cgi-bin/user-wms	Thu Sep 22 16:37:32 2022 +0200
@@ -0,0 +1,5 @@
+#!/bin/sh
+export LC_ALL="de_DE.UTF-8"
+export NLS_LANG=".AL32UTF8"
+export MS_MAPFILE=/opt/d4e/bin/flys.map
+/opt/mapserver/mapserv
--- a/docker/river-wms	Mon Sep 12 16:13:54 2022 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-#!/bin/sh
-export LC_ALL="de_DE.UTF-8"
-export NLS_LANG=".AL32UTF8"
-export MS_MAPFILE=/opt/d4e/bin/rivers.map
-/opt/mapserver/mapserv
--- a/docker/user-wms	Mon Sep 12 16:13:54 2022 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-#!/bin/sh
-export LC_ALL="de_DE.UTF-8"
-export NLS_LANG=".AL32UTF8"
-export MS_MAPFILE=/opt/d4e/bin/flys.map
-/opt/mapserver/mapserv
http://dive4elements.wald.intevation.org