Merge pull request #96 from camptocamp/cleanup

jmckenna · web-flow · commit cbc686ce05fe · 2025-02-17T12:49:40.000-04:00
Cleanup
diff --git a/README.md b/README.md
@@ -45,6 +45,6 @@ docker compose up -d
 ```
 Then use your browser to go to:
 ```
-http://localhost/cgi-bin/mapserv?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetCapabilities
+http://localhost?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetCapabilities
 ```
 
diff --git a/config.conf.tpl b/config.conf.tpl
@@ -6,7 +6,6 @@ CONFIG
     MS_ERRORFILE "stderr"
 #endif
 
-    PROJ_LIB _proj_lib
   END
   MAPS
     BASEMAPS "/etc/mapserver/osm-google.map"
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2'
-
 services:
   postgis:    
     build:
diff --git a/docker/postgis/Dockerfile b/docker/postgis/Dockerfile
@@ -12,7 +12,7 @@ RUN groupadd nopwsudo \
 
 RUN apt-get update \
     && DEBIAN_FRONTEND=noninteractive apt-get install -y \
-    git make build-essential python wget unzip mapserver-bin cgi-mapserver
+    git make build-essential python3 wget unzip mapserver-bin cgi-mapserver
 
 RUN mkdir /app \
     && chown -R mapserveruser /app    
diff --git a/docker/webserver/Dockerfile b/docker/webserver/Dockerfile
@@ -1,4 +1,4 @@
-FROM camptocamp/mapserver:master
+FROM camptocamp/mapserver:8.4-gdal3.10
 
 RUN apt-get update && \
 	apt-get install --assume-yes --no-install-recommends git make python3 gcc curl unzip wget

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM camptocamp/mapserver:master`
	`1`	`+FROM camptocamp/mapserver:8.4-gdal3.10`
`2`	`2`
`3`	`3`	`RUN apt-get update && \`
`4`	`4`	`apt-get install --assume-yes --no-install-recommends git make python3 gcc curl unzip wget`