Skip to content

Commit 6d02fbe

Browse files
Install python-is-python3 so that python will point to python3 (#2036)
1 parent 3ca8d4e commit 6d02fbe

7 files changed

+9
-7
lines changed

bin/prepare_test_environment.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,6 @@ EOF
4747

4848
if [ "$START_SERVER" = true ]; then
4949
cd /usr/src/app
50-
python3 server.py &
50+
python server.py &
5151
sleep 3
5252
fi

bin/start_server.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ if [ -n "${MANAGEMENT_USER+x}" ] && [ -n "${MANAGEMENT_PASSWORD+x}" ]; then
2323
fi
2424

2525
echo "Running migration..."
26-
python3 ./bin/migrate.py
26+
python ./bin/migrate.py
2727

2828
if [[ "$ENVIRONMENT" == "development" ]]; then
2929
flask --app server.py run --debug --reload --host 0.0.0.0 --port 8080
3030
else
31-
python3 server.py
31+
python server.py
3232
fi

bin/start_viewer.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ trap '' 16
3939
echo 0 > /sys/fs/cgroup/memory/memory.swappiness
4040

4141
# Start viewer
42-
sudo -E -u viewer dbus-run-session python3 viewer.py &
42+
sudo -E -u viewer dbus-run-session python viewer.py &
4343

4444
# Wait for the viewer
4545
while true; do

bin/start_wifi_connect.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ while [[ true ]]; do
3131
echo "Skipping setting up Wifi-Connect Access Point."
3232

3333
if [[ "$IS_CONNECTED" = 'false' ]]; then
34-
python3 send_zmq_message.py --action='show_splash'
34+
python send_zmq_message.py --action='show_splash'
3535
fi
3636

3737
exit 0
@@ -41,7 +41,7 @@ while [[ true ]]; do
4141
echo "Connect to the Access Point and configure the SSID and Passphrase for the network to connect to."
4242

4343
if [[ "$IS_CONNECTED" = '' ]]; then
44-
python3 send_zmq_message.py --action='setup_wifi'
44+
python send_zmq_message.py --action='setup_wifi'
4545
fi
4646

4747
IS_CONNECTED='false'

docker/Dockerfile.base.tmpl

+1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ RUN --mount=type=cache,target=/var/cache/apt \
3232
python3-pip \
3333
python3-setuptools \
3434
python3-simplejson \
35+
python-is-python3 \
3536
sqlite3
3637

3738
# Works around issue with `curl`

docker/Dockerfile.viewer.tmpl

+1
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ RUN --mount=type=cache,target=/var/cache/apt \
103103
python3-netifaces \
104104
python3-pip \
105105
python3-setuptools \
106+
python-is-python3 \
106107
ttf-wqy-zenhei \
107108
vlc \
108109
sqlite3

docker/Dockerfile.websocket.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ ENV GIT_HASH=$GIT_HASH
1212
ENV GIT_SHORT_HASH=$GIT_SHORT_HASH
1313
ENV GIT_BRANCH=$GIT_BRANCH
1414

15-
CMD ["python3", "websocket_server_layer.py"]
15+
CMD ["python", "websocket_server_layer.py"]

0 commit comments

Comments
 (0)