From 4642056f98f95f2626e4d4ca19fd379e4705270e Mon Sep 17 00:00:00 2001 From: Ivan Nikolaev-Axenov Date: Thu, 30 May 2024 15:15:08 +0300 Subject: [PATCH] .gitlab-ci.yml updated v24 --- clr_test/clearing-all/Dockerfile | 6 ++---- clr_test/clearing-all/db/Dockerfile | 8 +++----- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/clr_test/clearing-all/Dockerfile b/clr_test/clearing-all/Dockerfile index 209314043..e75545c2f 100644 --- a/clr_test/clearing-all/Dockerfile +++ b/clr_test/clearing-all/Dockerfile @@ -4,10 +4,8 @@ ENV CLEARING_HOME="/opt/clearing" ENV CLEARING_HOME_BIN="/opt/clearing/bin" ENV CLEARING_HOME_CFG="/opt/clearing/bin" -WORKDIR /builds/mfd/clearing/z-distr/target/clearing/ - -ADD ./bin $CLEARING_HOME_BIN -ADD ./settings $CLEARING_HOME/settings +ADD /builds/mfd/clearing/z-distr/target/clearing/bin $CLEARING_HOME_BIN +ADD /builds/mfd/clearing/z-distr/target/clearing/settings $CLEARING_HOME/settings ADD ./kill_all.sh $CLEARING_HOME/kill_all.sh ADD ./launch_all.sh $CLEARING_HOME/launch_all.sh diff --git a/clr_test/clearing-all/db/Dockerfile b/clr_test/clearing-all/db/Dockerfile index 8707dba32..4d37ba093 100644 --- a/clr_test/clearing-all/db/Dockerfile +++ b/clr_test/clearing-all/db/Dockerfile @@ -1,7 +1,5 @@ FROM mirror.gcr.io/postgres:14.1-alpine -WORKDIR /builds/mfd/clearing/z-distr/target/clearing/db - -ADD ./DDL.sql /docker-entrypoint-initdb.d/ -ADD ./export.sql /docker-entrypoint-initdb.d/ -ADD ./test-data.sql /docker-entrypoint-initdb.d/ \ No newline at end of file +ADD /builds/mfd/clearing/z-distr/target/clearing/db/DDL.sql /docker-entrypoint-initdb.d/ +ADD /builds/mfd/clearing/z-distr/target/clearing/db/export.sql /docker-entrypoint-initdb.d/ +ADD /builds/mfd/clearing/z-distr/target/clearing/db/test-data.sql /docker-entrypoint-initdb.d/ \ No newline at end of file