[PATCH 2 of 2] Do not rely on scripts being executable

Wald Commits scm-commit at wald.intevation.org
Fri Jan 20 12:23:32 CET 2023


# HG changeset patch
# User Tom Gottfried <tom at intevation.de>
# Date 1674213744 -3600
#      Fri Jan 20 12:22:24 2023 +0100
# Branch 3.2.x
# Node ID f98e5c7775d201b0f962b1ec3730329c8d41bf1d
# Parent  e5b86f024141c19f39db9149f2fe0b84a2a7e74d
Do not rely on scripts being executable

diff -r e5b86f024141 -r f98e5c7775d2 docker/Dockerfile.artifacts
--- a/docker/Dockerfile.artifacts	Fri Jan 20 11:31:13 2023 +0100
+++ b/docker/Dockerfile.artifacts	Fri Jan 20 12:22:24 2023 +0100
@@ -41,8 +41,8 @@
 RUN curl -s $WSPLGEN_URL | gunzip > bin/wsplgen && chmod +x bin/wsplgen
 
 # Create h2 databases
-RUN ../../framework/artifact-database/bin/createArtifacts.sh
-RUN ./bin/createDatacage.sh
+RUN sh ../../framework/artifact-database/bin/createArtifacts.sh
+RUN sh ./bin/createDatacage.sh
 
 RUN mvn -q -DskipTests package assembly:single
 
@@ -53,4 +53,4 @@
 
 RUN tar -xf ../src/river/artifacts/target/river-artifacts-1.0-SNAPSHOT-bin.tar
 
-CMD bin/run.sh
+CMD sh bin/run.sh
diff -r e5b86f024141 -r f98e5c7775d2 docker/Dockerfile.db
--- a/docker/Dockerfile.db	Fri Jan 20 11:31:13 2023 +0100
+++ b/docker/Dockerfile.db	Fri Jan 20 12:22:24 2023 +0100
@@ -58,7 +58,7 @@
 # Initialize database
 # Note that PostGIS legacy.sql is needed to support the outdated MapServer 6
 RUN $PGBIN/pg_ctl start -wo "--config_file=$PGCONF" && \
-    /opt/d4eriver_db/postgresql-setup.sh && \
+    sh /opt/d4eriver_db/postgresql-setup.sh && \
     psql -f ~/demodaten/d4e_demodata.dump.sql d4e && \
     psql -d d4e -f /usr/share/postgresql/$PG_VERSION/contrib/postgis-3.1/legacy.sql && \
     createuser -S -D -R seddb && \


More information about the Dive4Elements-commits mailing list