From 34a25863b5ef6063164c42f8db4014bab5d22950 Mon Sep 17 00:00:00 2001 From: Matthias Mair Date: Tue, 20 Feb 2024 00:32:24 +0100 Subject: [PATCH] reset work command --- Dockerfile | 2 +- docker/execute.sh | 19 +------------------ 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/Dockerfile b/Dockerfile index dea7c60c6f..89bc192e06 100644 --- a/Dockerfile +++ b/Dockerfile @@ -162,7 +162,7 @@ WORKDIR ${INVENTREE_HOME} ENTRYPOINT ["/bin/ash", "./docker/init.sh"] # Launch the development server -CMD ${INVENTREE_HOME}/execute.sh +CMD ["invoke", "server", "-a", "${INVENTREE_WEB_ADDR}:${INVENTREE_WEB_PORT}"] # Image target for devcontainer FROM dev as devcontainer diff --git a/docker/execute.sh b/docker/execute.sh index 8272f7f10c..b76dd5c35d 100755 --- a/docker/execute.sh +++ b/docker/execute.sh @@ -38,21 +38,4 @@ if [ "$(awk -v num1=$old_version -v num2=$new_version 'BEGIN { print (num1 < num cp "$db_version_new" "$db_version_old" fi - -# Run invoke server in the background -invoke server -a "${INVENTREE_WEB_ADDR}:${INVENTREE_WEB_PORT}" | sed "s/^/server: /" & - -# Store the PID of the last background process (invoke server) -server_pid=$! - -# Run invoke worker in the background -invoke worker | sed "s/^/worker: /" & - -# Store the PID of the last background process (invoke worker) -worker_pid=$! - -# Wait for both processes to finish -wait $server_pid -wait $worker_pid - -echo "Both processes have completed." +echo "Database migration/update checks completed."