Mercurial > dive4elements > river
changeset 9777:f98e5c7775d2 3.2.x
Do not rely on scripts being executable
| author | Tom Gottfried <tom@intevation.de> |
|---|---|
| date | Fri, 20 Jan 2023 12:22:24 +0100 |
| parents | e5b86f024141 |
| children | b57b236c4f4e |
| files | docker/Dockerfile.artifacts docker/Dockerfile.db |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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 && \