Use sigstore for Python artifact verification #303
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,7 +11,8 @@ cosign: | |
| args: | ||
| PYTHON_VERSION: 3.11.13 | ||
| PIP_VERSION: 25.1.1 | ||
| CERT_IDENTITY: [email protected] | ||
| CERT_OIDC_ISSUER: https://accounts.google.com | ||
| labels: | ||
| io.hass.base.name: python | ||
| org.opencontainers.image.source: https://github.com/home-assistant/docker-base | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,11 +4,12 @@ FROM $BUILD_FROM | |
| ARG \ | ||
| PYTHON_VERSION \ | ||
| PIP_VERSION \ | ||
| CERT_IDENTITY \ | ||
| CERT_OIDC_ISSUER \ | ||
| QEMU_CPU | ||
|
|
||
| # ensure local python is preferred over distribution python | ||
| ENV PATH=/usr/local/bin:$PATH | ||
|
|
||
| # Set shell | ||
| SHELL ["/bin/ash", "-o", "pipefail", "-c"] | ||
|
|
@@ -17,19 +18,20 @@ COPY *.patch /usr/src/ | |
| RUN set -ex \ | ||
| && export PYTHON_VERSION=${PYTHON_VERSION} \ | ||
| && apk add --no-cache --virtual .fetch-deps \ | ||
| openssl \ | ||
| tar \ | ||
| xz \ | ||
| && apk add --no-cache --virtual .cosign cosign \ | ||
| --repository="https://dl-cdn.alpinelinux.org/alpine/v3.21/community" \ | ||
|
Comment on lines
+24
to
+25
There was a problem hiding this comment. The Python sigstore bundle use the new bundle format, the verification of which requires There is a draft PR to add sigstore validation to the "official" Python docker images which uses a similar approach. docker-library/python#983 |
||
| \ | ||
| && curl -L -o python.tar.xz "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz" \ | ||
| && curl -L -o python.tar.xz.sigstore "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz.sigstore" \ | ||
| && cosign verify-blob \ | ||
| --new-bundle-format \ | ||
| --certificate-identity "${CERT_IDENTITY}" \ | ||
| --certificate-oidc-issuer "${CERT_OIDC_ISSUER}" \ | ||
| --bundle python.tar.xz.sigstore \ | ||
| python.tar.xz \ | ||
| && mkdir -p /usr/src/python \ | ||
| && tar -xJC /usr/src/python --strip-components=1 -f python.tar.xz \ | ||
| && rm python.tar.xz \ | ||
|
|
@@ -63,7 +65,7 @@ RUN set -ex \ | |
| zlib-dev \ | ||
| bluez-dev \ | ||
| # add build deps before removing fetch deps in case there's overlap | ||
| && apk del .fetch-deps .cosign \ | ||
| \ | ||
| && for i in /usr/src/*.patch; do \ | ||
| patch -d /usr/src/python -p 1 < "${i}"; done \ | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,7 +11,8 @@ cosign: | |
| args: | ||
| PYTHON_VERSION: 3.12.11 | ||
| PIP_VERSION: 25.1.1 | ||
| CERT_IDENTITY: [email protected] | ||
| CERT_OIDC_ISSUER: https://accounts.google.com | ||
| labels: | ||
| io.hass.base.name: python | ||
| org.opencontainers.image.source: https://github.com/home-assistant/docker-base | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,7 +11,8 @@ cosign: | |
| args: | ||
| PYTHON_VERSION: 3.13.4 | ||
| PIP_VERSION: 25.1.1 | ||
| CERT_IDENTITY: [email protected] | ||
| CERT_OIDC_ISSUER: https://accounts.google.com | ||
| labels: | ||
| io.hass.base.name: python | ||
| org.opencontainers.image.source: https://github.com/home-assistant/docker-base | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hm, I think the space variant also did not expand $PATH... I wonder how certain things even worked with that in mind 🤔
Anyways, this is the right thing to do 👍