Skip to content

Commit 489a420

Browse files
chore: moved from deprecated OpenSSL URL (#1412)
Fixed deprecated OpenSSL URL use. Signed-off-by: Abhinav Pradeep <abhinav.pradeep@oracle.com>
1 parent ec546d6 commit 489a420

7 files changed

Lines changed: 12 additions & 8 deletions

File tree

src/macaron/build_spec_generator/dockerfile/pypi_dockerfile_output.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,12 +173,12 @@ def openssl_install_commands(version: Version) -> str:
173173
# and 3.6 to 3.9 can be compiled with OpenSSL 1.1.1. Therefore, we compile as below:
174174
if version in SpecifierSet(">=3.6"):
175175
openssl_version = "1.1.1w"
176-
source_url = "https://www.openssl.org/source/old/1.1.1/openssl-1.1.1w.tar.gz"
176+
source_url = "https://github.com/openssl/openssl/releases/download/OpenSSL_1_1_1w/openssl-1.1.1w.tar.gz"
177177
# From the same document, "Python versions 3.6 to 3.9 are compatible with OpenSSL 1.0.2,
178178
# 1.1.0, and 1.1.1". As an attempt to generalize for any >= 3.3, we use OpenSSL 1.0.2.
179179
else:
180180
openssl_version = "1.0.2u"
181-
source_url = "https://www.openssl.org/source/old/1.0.2/openssl-1.0.2u.tar.gz"
181+
source_url = "https://github.com/openssl/openssl/releases/download/OpenSSL_1_0_2u/openssl-1.0.2u.tar.gz"
182182

183183
return f"""# Build OpenSSL {openssl_version}
184184
RUN <<EOF

tests/build_spec_generator/dockerfile/__snapshots__/test_pypi_dockerfile_output.ambr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
# Build OpenSSL 1.1.1w
3030
RUN <<EOF
31-
wget https://www.openssl.org/source/old/1.1.1/openssl-1.1.1w.tar.gz
31+
wget https://github.com/openssl/openssl/releases/download/OpenSSL_1_1_1w/openssl-1.1.1w.tar.gz
3232
tar xzf openssl-1.1.1w.tar.gz
3333
cd openssl-1.1.1w
3434
./config --prefix=/opt/openssl --openssldir=/opt/openssl shared zlib

tests/build_spec_generator/dockerfile/test_pypi_dockerfile_output.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import pytest
99

1010
from macaron.build_spec_generator.common_spec.base_spec import BaseBuildSpecDict, SpecBuildCommandDict
11+
from macaron.build_spec_generator.dockerfile import pypi_dockerfile_output
1112
from macaron.build_spec_generator.dockerfile.pypi_dockerfile_output import gen_dockerfile
1213

1314

@@ -53,6 +54,9 @@ def fixture_base_build_spec() -> BaseBuildSpecDict:
5354
)
5455

5556

56-
def test_successful_generation(snapshot: str, pypi_build_spec: BaseBuildSpecDict) -> None:
57+
def test_successful_generation(
58+
monkeypatch: pytest.MonkeyPatch, snapshot: str, pypi_build_spec: BaseBuildSpecDict
59+
) -> None:
5760
"""Ensure that dockerfile is correctly generated for pypi_build_spec"""
61+
monkeypatch.setattr(pypi_dockerfile_output, "get_latest_cpython_patch", lambda _major, _minor: "3.9.25")
5862
assert gen_dockerfile(pypi_build_spec) == snapshot

tests/integration/cases/pypi_cachetools/expected_dockerfile.buildspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ RUN dnf install \
2525

2626
# Build OpenSSL 1.1.1w
2727
RUN <<EOF
28-
wget https://www.openssl.org/source/old/1.1.1/openssl-1.1.1w.tar.gz
28+
wget https://github.com/openssl/openssl/releases/download/OpenSSL_1_1_1w/openssl-1.1.1w.tar.gz
2929
tar xzf openssl-1.1.1w.tar.gz
3030
cd openssl-1.1.1w
3131
./config --prefix=/opt/openssl --openssldir=/opt/openssl shared zlib

tests/integration/cases/pypi_markdown-it-py/expected_dockerfile.buildspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ RUN dnf install \
2525

2626
# Build OpenSSL 1.1.1w
2727
RUN <<EOF
28-
wget https://www.openssl.org/source/old/1.1.1/openssl-1.1.1w.tar.gz
28+
wget https://github.com/openssl/openssl/releases/download/OpenSSL_1_1_1w/openssl-1.1.1w.tar.gz
2929
tar xzf openssl-1.1.1w.tar.gz
3030
cd openssl-1.1.1w
3131
./config --prefix=/opt/openssl --openssldir=/opt/openssl shared zlib

tests/integration/cases/pypi_pytesseract/expected_dockerfile.buildspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ RUN dnf install \
2525

2626
# Build OpenSSL 1.1.1w
2727
RUN <<EOF
28-
wget https://www.openssl.org/source/old/1.1.1/openssl-1.1.1w.tar.gz
28+
wget https://github.com/openssl/openssl/releases/download/OpenSSL_1_1_1w/openssl-1.1.1w.tar.gz
2929
tar xzf openssl-1.1.1w.tar.gz
3030
cd openssl-1.1.1w
3131
./config --prefix=/opt/openssl --openssldir=/opt/openssl shared zlib

tests/integration/cases/pypi_toga/expected_dockerfile.buildspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ RUN dnf install \
2525

2626
# Build OpenSSL 1.1.1w
2727
RUN <<EOF
28-
wget https://www.openssl.org/source/old/1.1.1/openssl-1.1.1w.tar.gz
28+
wget https://github.com/openssl/openssl/releases/download/OpenSSL_1_1_1w/openssl-1.1.1w.tar.gz
2929
tar xzf openssl-1.1.1w.tar.gz
3030
cd openssl-1.1.1w
3131
./config --prefix=/opt/openssl --openssldir=/opt/openssl shared zlib

0 commit comments

Comments
 (0)