Skip to content

Commit d490461

Browse files
authored
Change aarch64 build image to follow the x64 more closely (#17501)
1 parent 6f52f33 commit d490461

File tree

1 file changed

+3
-12
lines changed

1 file changed

+3
-12
lines changed

.builders/images/linux-aarch64/Dockerfile

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ RUN yum install -y openssl-devel && \
3030
&& yum remove -y openssl-devel
3131

3232
# Set up virtual environment for Python 2
33-
RUN export LD_LIBRARY_PATH="/opt/python/${PYTHON2_VERSION}/lib:${LD_LIBRARY_PATH}"; \
34-
/opt/python/${PYTHON2_VERSION}/bin/python2.7 -m pip install --no-warn-script-location virtualenv \
33+
RUN /opt/python/${PYTHON2_VERSION}/bin/python2.7 -m pip install --no-warn-script-location virtualenv \
3534
&& /opt/python/${PYTHON2_VERSION}/bin/python2.7 -m virtualenv /py2
3635

3736
# openssl
@@ -54,11 +53,11 @@ RUN yum install -y perl-IPC-Cmd && \
5453
ldconfig
5554

5655
# Compile and install Python 3
57-
ENV PYTHON3_VERSION=3.11.5
56+
ENV PYTHON3_VERSION=3.11.8
5857
RUN yum install -y libffi-devel && \
5958
DOWNLOAD_URL="https://python.org/ftp/python/{{version}}/Python-{{version}}.tgz" \
6059
VERSION="${PYTHON3_VERSION}" \
61-
SHA256="a12a0a013a30b846c786c010f2c19dd36b7298d888f7c4bd1581d90ce18b5e58" \
60+
SHA256="d3019a613b9e8761d260d9ebe3bd4df63976de30464e5c0189566e1ae3f61889" \
6261
RELATIVE_PATH="Python-{{version}}" \
6362
bash install-from-source.sh \
6463
--prefix=/opt/python/${PYTHON_VERSION} \
@@ -178,14 +177,6 @@ RUN \
178177
--with-ssl=/usr/local \
179178
&& rm /usr/local/bin/curl
180179

181-
# https://doc.rust-lang.org/cargo/reference/config.html#netgit-fetch-with-cli
182-
# https://github.com/rust-lang/cargo/issues/10762
183-
ENV CARGO_NET_GIT_FETCH_WITH_CLI="true"
184-
185-
# Environment variables to help openssl crate find OpenSSL
186-
ENV OPENSSL_LIB_DIR="/usr/local/lib64"
187-
ENV OPENSSL_INCLUDE_DIR="/usr/local/include"
188-
189180
# Set up runner
190181
COPY runner_dependencies.txt /runner_dependencies.txt
191182
RUN python3 -m pip install --no-warn-script-location -r /runner_dependencies.txt

0 commit comments

Comments
 (0)