Merge branch 'development'

WebSpellChecker · Sep 29, 2023 · 69dc3d0 · 69dc3d0
2 parents 62f8fc5 + 8ce0f4f
commit 69dc3d0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -115,9 +115,10 @@ RUN PACKAGE_FILE=$(ls -1t $DEPLOYMENT_DIR/$APP_NAME_MASK 2>/dev/null | head -n 1
     [ -z "$PACKAGE_FILE" ] && echo "Error. Docker image build failed: No valid application package detected." && exit 1 || \
     echo "Using package file: $PACKAGE_FILE" && \
     tar -xvf $PACKAGE_FILE -C $DEPLOYMENT_DIR/ && \
-    perl $APP_ROOT_DIR*/automated_install.pl && \
+    perl $APP_ROOT_DIR*/automated_install.pl || exit 1 && \
     rm -rf $APP_ROOT_DIR* $DEPLOYMENT_DIR/$APP_NAME_MASK && \
-    [ -d "${APP_SERVER_DIR}/Logs" ] && tar -czvf "${APP_SERVER_DIR}"/Logs/img_build_logs.tar.gz -C ${APP_SERVER_DIR} Logs/* --remove-files || \
+    [ -d "${APP_SERVER_DIR}/Logs" ] && \
+    tar czvf ${APP_SERVER_DIR}/Logs/img_build_logs.tar.gz -C ${APP_SERVER_DIR} Logs --remove-files 2> /dev/null || \
     mkdir -p $APP_SERVER_DIR/Logs && \
     ln -s /dev/stdout $APP_SERVER_DIR/Logs/Main.log && \
     ln -s /dev/stdout $APP_SERVER_DIR/Logs/Child-0.log && \

diff --git a/Dockerfile.centos b/Dockerfile.centos
@@ -122,9 +122,10 @@ RUN PACKAGE_FILE=$(ls -1t $DEPLOYMENT_DIR/$APP_NAME_MASK 2>/dev/null | head -n 1
     [ -z "$PACKAGE_FILE" ] && echo "Error. Docker image build failed: No valid application package detected." && exit 1 || \
     echo "Using package file: $PACKAGE_FILE" && \
     tar -xvf $PACKAGE_FILE -C $DEPLOYMENT_DIR/ && \
-    perl $APP_ROOT_DIR*/automated_install.pl && \
+    perl $APP_ROOT_DIR*/automated_install.pl || exit 1 && \
     rm -rf $APP_ROOT_DIR* $DEPLOYMENT_DIR/$APP_NAME_MASK && \
-    [ -d "${APP_SERVER_DIR}/Logs" ] && tar -czvf "${APP_SERVER_DIR}"/Logs/img_build_logs.tar.gz -C ${APP_SERVER_DIR} Logs/* --remove-files || \
+    [ -d "${APP_SERVER_DIR}/Logs" ] && \
+    tar czvf ${APP_SERVER_DIR}/Logs/img_build_logs.tar.gz -C ${APP_SERVER_DIR} Logs --remove-files 2> /dev/null || \
     mkdir -p $APP_SERVER_DIR/Logs && \
     ln -s /dev/stdout $APP_SERVER_DIR/Logs/Main.log && \
     ln -s /dev/stdout $APP_SERVER_DIR/Logs/Child-0.log && \

diff --git a/Dockerfile.redhat b/Dockerfile.redhat
@@ -120,9 +120,10 @@ RUN PACKAGE_FILE=$(ls -1t $DEPLOYMENT_DIR/$APP_NAME_MASK 2>/dev/null | head -n 1
     [ -z "$PACKAGE_FILE" ] && echo "Error. Docker image build failed: No valid application package detected." && exit 1 || \
     echo "Using package file: $PACKAGE_FILE" && \
     tar -xvf $PACKAGE_FILE -C $DEPLOYMENT_DIR/ && \
-    perl $APP_ROOT_DIR*/automated_install.pl && \
+    perl $APP_ROOT_DIR*/automated_install.pl || exit 1 && \
     rm -rf $APP_ROOT_DIR* $DEPLOYMENT_DIR/$APP_NAME_MASK && \
-    [ -d "${APP_SERVER_DIR}/Logs" ] && tar -czvf "${APP_SERVER_DIR}"/Logs/img_build_logs.tar.gz -C ${APP_SERVER_DIR} Logs/* --remove-files || \
+    [ -d "${APP_SERVER_DIR}/Logs" ] && \
+    tar czvf ${APP_SERVER_DIR}/Logs/img_build_logs.tar.gz -C ${APP_SERVER_DIR} Logs --remove-files 2> /dev/null || \
     mkdir -p $APP_SERVER_DIR/Logs && \
     ln -s /dev/stdout $APP_SERVER_DIR/Logs/Main.log && \
     ln -s /dev/stdout $APP_SERVER_DIR/Logs/Child-0.log && \