diff --git a/bin/prepare_test_environment.sh b/bin/prepare_test_environment.sh index 573e2525..e849164e 100644 --- a/bin/prepare_test_environment.sh +++ b/bin/prepare_test_environment.sh @@ -47,6 +47,6 @@ EOF if [ "$START_SERVER" = true ]; then cd /usr/src/app - python3 server.py & + python server.py & sleep 3 fi diff --git a/bin/start_server.sh b/bin/start_server.sh index 337d6821..15882013 100755 --- a/bin/start_server.sh +++ b/bin/start_server.sh @@ -23,10 +23,10 @@ if [ -n "${MANAGEMENT_USER+x}" ] && [ -n "${MANAGEMENT_PASSWORD+x}" ]; then fi echo "Running migration..." -python3 ./bin/migrate.py +python ./bin/migrate.py if [[ "$ENVIRONMENT" == "development" ]]; then flask --app server.py run --debug --reload --host 0.0.0.0 --port 8080 else - python3 server.py + python server.py fi diff --git a/bin/start_viewer.sh b/bin/start_viewer.sh index a7a8b48b..bd4dd1d8 100755 --- a/bin/start_viewer.sh +++ b/bin/start_viewer.sh @@ -39,7 +39,7 @@ trap '' 16 echo 0 > /sys/fs/cgroup/memory/memory.swappiness # Start viewer -sudo -E -u viewer dbus-run-session python3 viewer.py & +sudo -E -u viewer dbus-run-session python viewer.py & # Wait for the viewer while true; do diff --git a/bin/start_wifi_connect.sh b/bin/start_wifi_connect.sh index b68b451e..9fcb5804 100644 --- a/bin/start_wifi_connect.sh +++ b/bin/start_wifi_connect.sh @@ -31,7 +31,7 @@ while [[ true ]]; do echo "Skipping setting up Wifi-Connect Access Point." if [[ "$IS_CONNECTED" = 'false' ]]; then - python3 send_zmq_message.py --action='show_splash' + python send_zmq_message.py --action='show_splash' fi exit 0 @@ -41,7 +41,7 @@ while [[ true ]]; do echo "Connect to the Access Point and configure the SSID and Passphrase for the network to connect to." if [[ "$IS_CONNECTED" = '' ]]; then - python3 send_zmq_message.py --action='setup_wifi' + python send_zmq_message.py --action='setup_wifi' fi IS_CONNECTED='false' diff --git a/docker/Dockerfile.base.tmpl b/docker/Dockerfile.base.tmpl index 07f30867..be8525d8 100644 --- a/docker/Dockerfile.base.tmpl +++ b/docker/Dockerfile.base.tmpl @@ -32,6 +32,7 @@ RUN --mount=type=cache,target=/var/cache/apt \ python3-pip \ python3-setuptools \ python3-simplejson \ + python-is-python3 \ sqlite3 # Works around issue with `curl` diff --git a/docker/Dockerfile.viewer.tmpl b/docker/Dockerfile.viewer.tmpl index bac1daaf..5cce0748 100644 --- a/docker/Dockerfile.viewer.tmpl +++ b/docker/Dockerfile.viewer.tmpl @@ -103,6 +103,7 @@ RUN --mount=type=cache,target=/var/cache/apt \ python3-netifaces \ python3-pip \ python3-setuptools \ + python-is-python3 \ ttf-wqy-zenhei \ vlc \ sqlite3 diff --git a/docker/Dockerfile.websocket.tmpl b/docker/Dockerfile.websocket.tmpl index 92735e08..b4077b0d 100644 --- a/docker/Dockerfile.websocket.tmpl +++ b/docker/Dockerfile.websocket.tmpl @@ -12,4 +12,4 @@ ENV GIT_HASH=$GIT_HASH ENV GIT_SHORT_HASH=$GIT_SHORT_HASH ENV GIT_BRANCH=$GIT_BRANCH -CMD ["python3", "websocket_server_layer.py"] +CMD ["python", "websocket_server_layer.py"]