Skip to content

Commit 3f985c7

Browse files
committed
Dockerfile: Use python3 executable.
Python should be invoked as `python3` since we are writing python3 code and not python2. See https://peps.python.org/pep-0394/#recommendation Many (most?) distributions do not distribute a "python" executable any more, forcing you to pick either 2 or 3.
1 parent 01ae93f commit 3f985c7

File tree

5 files changed

+4
-6
lines changed

5 files changed

+4
-6
lines changed

.containerversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
46
1+
47

Dockerfile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,6 @@ RUN if [ "${TARGETPLATFORM}" = "linux/arm64" ]; then \
121121
rm /tmp/protoc-21.2.zip
122122
ENV PATH /opt/protoc/bin:$PATH
123123

124-
# Make Python3 the default
125-
RUN update-alternatives --install /usr/bin/python python /usr/bin/python3 1
126-
127124
# Developer tools
128125
RUN apt-get update && apt-get install -y \
129126
bash-completion

external/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ ExternalProject_Add(libwally-core
5252
COMMAND ${CMAKE_COMMAND} -E env
5353
"CFLAGS=${LIBWALLY_CFLAGS}"
5454
"LDFLAGS=${LIBWALLY_LDFLAGS}"
55+
PYTHON_VERSION=3
5556
${CMAKE_CURRENT_SOURCE_DIR}/libwally-core/configure
5657
${CONFIGURE_FLAGS}
5758
${LIBWALLY_CONFIGURE_FLAGS}

scripts/expand_template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env python
1+
#!/usr/bin/env python3
22
"""Expand python templates"""
33

44
from string import Template

scripts/get_version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env python
1+
#!/usr/bin/env python3
22
"""
33
Parse the tags and strip the prefix
44
First argument should be prefix to match against

0 commit comments

Comments
 (0)