From 34dbb1985ce8dabd7edb17477eb8040d4d319731 Mon Sep 17 00:00:00 2001 From: Florian Bezannier Date: Sun, 30 May 2021 18:34:22 +0200 Subject: [PATCH] update docker image --- docker_files/dockerconfig.conf | 1 - docker_files/init.sh | 23 +---------------------- 2 files changed, 1 insertion(+), 23 deletions(-) delete mode 100644 docker_files/dockerconfig.conf diff --git a/docker_files/dockerconfig.conf b/docker_files/dockerconfig.conf deleted file mode 100644 index 676c98d..0000000 --- a/docker_files/dockerconfig.conf +++ /dev/null @@ -1 +0,0 @@ -export SHELL_ONLY="TRUE" diff --git a/docker_files/init.sh b/docker_files/init.sh index 358050d..6e36380 100644 --- a/docker_files/init.sh +++ b/docker_files/init.sh @@ -1,24 +1,3 @@ #!/bin/bash echo "Containerised psa_car_controller loading..." - -echo "Checking for container configuration file /config/dockerconfig.conf" -FILE=/config/dockerconfig.conf -if [ -f "$FILE" ]; then - echo "$FILE exists. Importing file..." - source $FILE -else - echo "$FILE does not exist. Setting default value for SHELL_ONLY=TRUE" - export SHELL_ONLY="TRUE" - echo "Copying default dockerconfig.conf file to /config" - cp /psa_car_controller/docker_files/dockerconfig.conf /config -fi - - -if [ "$SHELL_ONLY" == "TRUE" ] -then - echo "SHELL_ONLY = TRUE. Loading just a bash shell" - /bin/bash -else - echo "SHELL_ONLY = FALSE. Running server.py" - python3 /psa_car_controller/server.py -f /config/test.json -c /config/charge_config1.json -p 5000 -l 0.0.0.0 -fi +python3 /psa_car_controller/server.py -p 5000 -l 0.0.0.0 --web-conf