clearing-tester.jar, swt-dbf-converter-0.0.1.jar jar files updated; clearing-checker.sh, clearing-converter.sh, run_test_env.sh startup cmd fixed, Dockerfile multiple seds replaced with find

This commit is contained in:
Ivan Nikolaev-Axenov 2025-02-27 17:41:47 +03:00
parent 2017d1f059
commit 3d0b4a1a20
6 changed files with 6 additions and 9 deletions

View file

@ -23,6 +23,7 @@ RUN chmod +x $CLEARING_HOME/clearing_testing_utils/clearing-tester/*.sh
RUN mkdir -p $CLEARING_HOME/files/swt/importer/in
RUN mkdir -p $CLEARING_HOME/files/swt/importer/out
RUN mkdir -p $CLEARING_HOME/files/swt/importer/error
RUN mkdir -p $CLEARING_HOME/files/swt/importer/sftp-in
RUN mkdir -p $CLEARING_HOME/files/swt/exporter
RUN mkdir -p $CLEARING_HOME/files/dbf/importer/in
RUN mkdir -p $CLEARING_HOME/files/dbf/importer/out
@ -37,10 +38,6 @@ RUN mkdir -p $CLEARING_HOME/files/xml/exporter
RUN mkdir -p $CLEARING_HOME_BIN/log_artifacts
WORKDIR $CLEARING_HOME
RUN sed -i 's/\r$//' $CLEARING_HOME/*.sh
RUN sed -i 's/\r$//' $CLEARING_HOME/clearing_testing_utils/*.sh
RUN sed -i 's/\r$//' $CLEARING_HOME/clearing_testing_utils/clearing-checker/*.sh
RUN sed -i 's/\r$//' $CLEARING_HOME/clearing_testing_utils/clearing-converter/*.sh
RUN sed -i 's/\r$//' $CLEARING_HOME/clearing_testing_utils/clearing-tester/*.sh
RUN find . -name "*.sh" | xargs sed -i 's/\r$//'
ENTRYPOINT [ "./launch_and_test.sh" ]
ENTRYPOINT [ "./launch_and_test.sh" ]

View file

@ -3,6 +3,6 @@
CLEARING_TEST_HOME=/opt/clearing/clearing_testing_utils/
cd $CLEARING_TEST_HOME/clearing-checker
CMD="java -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:9992 -jar dbf-swt-checker-1.0.jar --spring.config.location=$CLEARING_TEST_HOME/clearing-checker/"
CMD="java -jar dbf-swt-checker-1.0.jar --spring.config.location=$CLEARING_TEST_HOME/clearing-checker/"
$CMD >/dev/null 2>&1 &

View file

@ -3,7 +3,7 @@
CLEARING_TEST_HOME=/opt/clearing/clearing_testing_utils/
cd $CLEARING_TEST_HOME/clearing-converter
CMD="java -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:9991 -jar swt-dbf-converter-0.0.1.jar --spring.config.location=$CLEARING_TEST_HOME/clearing-converter/"
CMD="java -jar swt-dbf-converter-0.0.1.jar --spring.config.location=$CLEARING_TEST_HOME/clearing-converter/"
$CMD >/dev/null 2>&1 &

View file

@ -5,4 +5,4 @@ cd /opt/clearing/clearing_testing_utils
sh ./clearing-checker/clearing-checker.sh
sh ./clearing-converter/clearing-converter.sh
echo Test finish. xit code: $?
echo Test initialization finished. xit code: $?