From 4a1a8932204d0f9edad983d7ccd668a852cdbb0b Mon Sep 17 00:00:00 2001
From: Torsten Friebe <torsten.friebe@gmail.com>
Date: Tue, 23 Jan 2024 20:06:30 +0100
Subject: [PATCH] XPLANBOX-2609 fixed XPlanMapProxy config, renamed
consistently
---
.../xplan-mapproxy-docker/docker-entrypoint.sh | 4 ++--
.../xplan-webservices-mapproxy/xplan-mapproxy-docker/pom.xml | 2 +-
.../{xplan-docker-mapproxy.xml => xplan-mapproxy-docker.xml} | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
rename xplan-webservices/xplan-webservices-mapproxy/xplan-mapproxy-docker/src/assembly/{xplan-docker-mapproxy.xml => xplan-mapproxy-docker.xml} (88%)
diff --git a/xplan-webservices/xplan-webservices-mapproxy/xplan-mapproxy-docker/docker-entrypoint.sh b/xplan-webservices/xplan-webservices-mapproxy/xplan-mapproxy-docker/docker-entrypoint.sh
index c7cebd8e8..64dd4d9c6 100755
--- a/xplan-webservices/xplan-webservices-mapproxy/xplan-mapproxy-docker/docker-entrypoint.sh
+++ b/xplan-webservices/xplan-webservices-mapproxy/xplan-mapproxy-docker/docker-entrypoint.sh
@@ -6,8 +6,8 @@ executionMode=$1
echo "[$(date -Iseconds)] MapProxy config initialization..."
defined_envs="$(printf '${%s} ' $(env | cut -d'=' -f1))"
-envsubst "$defined_envs" < /xplan-docker-mapproxy/xplan-mapproxy-config/mapproxy.yaml > /srv/mapproxy/mapproxy.yaml
-envsubst "$defined_envs" < /xplan-docker-mapproxy/xplan-mapproxy-config/seed.yaml > /srv/mapproxy/seed.yaml
+envsubst "$defined_envs" < /xplan-mapproxy-docker/xplan-mapproxy-config/mapproxy.yaml > /srv/mapproxy/mapproxy.yaml
+envsubst "$defined_envs" < /xplan-mapproxy-docker/xplan-mapproxy-config/seed.yaml > /srv/mapproxy/seed.yaml
if [ "$executionMode" == "seed" ]
then
diff --git a/xplan-webservices/xplan-webservices-mapproxy/xplan-mapproxy-docker/pom.xml b/xplan-webservices/xplan-webservices-mapproxy/xplan-mapproxy-docker/pom.xml
index 768dc0b81..276079d02 100644
--- a/xplan-webservices/xplan-webservices-mapproxy/xplan-mapproxy-docker/pom.xml
+++ b/xplan-webservices/xplan-webservices-mapproxy/xplan-mapproxy-docker/pom.xml
@@ -23,7 +23,7 @@
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptors>
- <descriptor>src/assembly/xplan-docker-mapproxy.xml</descriptor>
+ <descriptor>src/assembly/xplan-mapproxy-docker.xml</descriptor>
</descriptors>
<appendAssemblyId>false</appendAssemblyId>
</configuration>
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-mapproxy-docker.xml
similarity index 88%
rename from xplan-webservices/xplan-webservices-mapproxy/xplan-mapproxy-docker/src/assembly/xplan-docker-mapproxy.xml
rename to xplan-webservices/xplan-webservices-mapproxy/xplan-mapproxy-docker/src/assembly/xplan-mapproxy-docker.xml
index 06e81f7bd..2f486f4bb 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-mapproxy-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-mapproxy</id>
+ <id>xplan-mapproxy-docker</id>
<formats>
<format>tgz</format>
</formats>
- <baseDirectory>xplan-docker-mapproxy</baseDirectory>
+ <baseDirectory>xplan-mapproxy-docker</baseDirectory>
<dependencySets>
<!--xplan-mapproxy-config-->
<dependencySet>
--
GitLab