From 4d1e1b222d78eba6d982497aa8be47b83759976b Mon Sep 17 00:00:00 2001
From: Torsten Friebe <torsten.friebe@gmail.com>
Date: Tue, 23 Jan 2024 19:39:51 +0100
Subject: [PATCH] XPLANBOX-2609 fixed XPlanMapServer config, renamed
consistently
---
.../src/assembly/xplan-docker-mapproxy.xml | 2 +-
.../xplan-mapserver-docker/Dockerfile | 6 +++---
.../xplan-mapserver-docker/pom.xml | 2 +-
...plan-docker-mapserver.xml => xplan-mapserver-docker.xml} | 4 ++--
.../startupWithConfiguredMapserver.sh | 4 ++--
5 files changed, 9 insertions(+), 9 deletions(-)
rename xplan-webservices/xplan-webservices-mapserver/xplan-mapserver-docker/src/assembly/{xplan-docker-mapserver.xml => xplan-mapserver-docker.xml} (88%)
diff --git a/xplan-webservices/xplan-webservices-mapproxy/xplan-mapproxy-docker/src/assembly/xplan-docker-mapproxy.xml b/xplan-webservices/xplan-webservices-mapproxy/xplan-mapproxy-docker/src/assembly/xplan-docker-mapproxy.xml
index f8a104cb6a..06e81f7bd4 100644
--- a/xplan-webservices/xplan-webservices-mapproxy/xplan-mapproxy-docker/src/assembly/xplan-docker-mapproxy.xml
+++ b/xplan-webservices/xplan-webservices-mapproxy/xplan-mapproxy-docker/src/assembly/xplan-docker-mapproxy.xml
@@ -7,7 +7,7 @@
</formats>
<baseDirectory>xplan-docker-mapproxy</baseDirectory>
<dependencySets>
- <!--xplan-manager-config-->
+ <!--xplan-mapproxy-config-->
<dependencySet>
<outputDirectory>/xplan-mapproxy-config</outputDirectory>
<includes>
diff --git a/xplan-webservices/xplan-webservices-mapserver/xplan-mapserver-docker/Dockerfile b/xplan-webservices/xplan-webservices-mapserver/xplan-mapserver-docker/Dockerfile
index e3e7784d45..ab02526007 100644
--- a/xplan-webservices/xplan-webservices-mapserver/xplan-mapserver-docker/Dockerfile
+++ b/xplan-webservices/xplan-webservices-mapserver/xplan-mapserver-docker/Dockerfile
@@ -20,12 +20,12 @@ LABEL "org.opencontainers.image.created"="$BUILD_DATE" \
ENV TZ=Europe/Berlin
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install tzdata
-RUN mkdir -p /xplan-docker-mapserver \
+RUN mkdir -p /xplan-mapserver-config \
&& chown 1001 /etc/mapserver
ADD target/xplan-mapserver-docker-*.tgz /
-ADD startupWithConfiguredMapserver.sh /xplan-docker-mapserver/
+ADD startupWithConfiguredMapserver.sh /xplan-mapserver-config/
USER 1001
-CMD ["/xplan-docker-mapserver/startupWithConfiguredMapserver.sh"]
\ No newline at end of file
+CMD ["/xplan-mapserver-config/startupWithConfiguredMapserver.sh"]
\ No newline at end of file
diff --git a/xplan-webservices/xplan-webservices-mapserver/xplan-mapserver-docker/pom.xml b/xplan-webservices/xplan-webservices-mapserver/xplan-mapserver-docker/pom.xml
index dfd23baccf..b56d65b65a 100644
--- a/xplan-webservices/xplan-webservices-mapserver/xplan-mapserver-docker/pom.xml
+++ b/xplan-webservices/xplan-webservices-mapserver/xplan-mapserver-docker/pom.xml
@@ -23,7 +23,7 @@
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptors>
- <descriptor>src/assembly/xplan-docker-mapserver.xml</descriptor>
+ <descriptor>src/assembly/xplan-mapserver-docker.xml</descriptor>
</descriptors>
<appendAssemblyId>false</appendAssemblyId>
</configuration>
diff --git a/xplan-webservices/xplan-webservices-mapserver/xplan-mapserver-docker/src/assembly/xplan-docker-mapserver.xml b/xplan-webservices/xplan-webservices-mapserver/xplan-mapserver-docker/src/assembly/xplan-mapserver-docker.xml
similarity index 88%
rename from xplan-webservices/xplan-webservices-mapserver/xplan-mapserver-docker/src/assembly/xplan-docker-mapserver.xml
rename to xplan-webservices/xplan-webservices-mapserver/xplan-mapserver-docker/src/assembly/xplan-mapserver-docker.xml
index 11f42ead88..13dad84c19 100644
--- a/xplan-webservices/xplan-webservices-mapserver/xplan-mapserver-docker/src/assembly/xplan-docker-mapserver.xml
+++ b/xplan-webservices/xplan-webservices-mapserver/xplan-mapserver-docker/src/assembly/xplan-mapserver-docker.xml
@@ -1,11 +1,11 @@
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
- <id>xplan-docker-mapserver</id>
+ <id>xplan-mapserver-docker</id>
<formats>
<format>tgz</format>
</formats>
- <baseDirectory>xplan-docker-mapserver</baseDirectory>
+ <baseDirectory>xplan-mapserver-config</baseDirectory>
<dependencySets>
<!--xplan-mapserver-config-->
<dependencySet>
diff --git a/xplan-webservices/xplan-webservices-mapserver/xplan-mapserver-docker/startupWithConfiguredMapserver.sh b/xplan-webservices/xplan-webservices-mapserver/xplan-mapserver-docker/startupWithConfiguredMapserver.sh
index 6bf72c3640..783b7beac4 100755
--- a/xplan-webservices/xplan-webservices-mapserver/xplan-mapserver-docker/startupWithConfiguredMapserver.sh
+++ b/xplan-webservices/xplan-webservices-mapserver/xplan-mapserver-docker/startupWithConfiguredMapserver.sh
@@ -3,7 +3,7 @@
echo "MapServer config initialization..."
if [ -z ${MS_MAPFILE+x} ]; then
- echo "ERROR: environment variable MS_MAPFILE not set!"
+ echo "[$(date -Iseconds)] ERROR: environment variable MS_MAPFILE not set!"
exit 1
fi
@@ -15,7 +15,7 @@ fi
echo "[$(date -Iseconds)] Initializing mapserver config ..."
-cp /xplan-docker-mapserver/xplan-mapserver-config/mapserver.map $MS_MAPFILE
+cp /xplan-mapserver-config/xplan-mapserver-config/mapserver.map $MS_MAPFILE
XPLAN_S3_BUCKET_NAME="${XPLAN_S3_BUCKET_NAME:-tobedefined}"
AWS_ACCESS_KEY_ID="${AWS_ACCESS_KEY_ID:-tobedefined}"
--
GitLab