Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .github/workflows/build-docker-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,8 @@ jobs:
persist-credentials: false
- run: |
arch=$(echo "${{ runner.arch }}" | tr '[:upper:]' '[:lower:]')
NODE20_VERSION=$(cat staticnode/node-versions.json | jq -r '.[] | select(.version | startswith("v20")) | .version')
NODE24_VERSION=$(cat staticnode/node-versions.json | jq -r '.[] | select(.version | startswith("v24")) | .version')

echo "NODE20_ARCH_RELEASE=$arch:${NODE20_VERSION}" >> $GITHUB_ENV
echo "NODE24_ARCH_RELEASE=$arch:${NODE24_VERSION}" >> $GITHUB_ENV
# Pull the previous image, but if it fails return true anyway.
# Sometimes we add new docker images and if they've never been pushed
Expand Down Expand Up @@ -132,7 +130,6 @@ jobs:
platforms: ${{ matrix.IMAGE.DOCKER_PLATFORM }}
pull: true
build-args: |
NODE20_ARCH_RELEASE=${{ env.NODE20_ARCH_RELEASE }}
NODE24_ARCH_RELEASE=${{ env.NODE24_ARCH_RELEASE }}
${{ matrix.IMAGE.BUILD_ARGS }}
outputs: ${{ ((github.event_name == 'push' || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') && github.ref == 'refs/heads/main') && 'type=registry,compression=zstd' || 'type=docker' }}
Expand Down
3 changes: 0 additions & 3 deletions cryptography-linux/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
ARG NODE20_ARCH_RELEASE
ARG NODE24_ARCH_RELEASE
ARG PYCA_RELEASE
FROM ghcr.io/pyca/static-nodejs-${NODE20_ARCH_RELEASE} AS staticnodejs20
FROM ghcr.io/pyca/static-nodejs-${NODE24_ARCH_RELEASE} AS staticnodejs24
FROM quay.io/pypa/${PYCA_RELEASE}
LABEL org.opencontainers.image.authors="Python Cryptographic Authority"
Expand All @@ -28,7 +26,6 @@ RUN \
fi; \
fi

COPY --from=staticnodejs20 /out/ /staticnode/20/
COPY --from=staticnodejs24 /out/ /staticnode/24/
ADD install_openssl.sh /root/install_openssl.sh
ADD openssl-version.sh /root/openssl-version.sh
Expand Down
3 changes: 0 additions & 3 deletions runners/alpine/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
ARG NODE20_ARCH_RELEASE
ARG NODE24_ARCH_RELEASE
FROM ghcr.io/pyca/static-nodejs-${NODE20_ARCH_RELEASE} AS staticnodejs20
FROM ghcr.io/pyca/static-nodejs-${NODE24_ARCH_RELEASE} AS staticnodejs24

FROM alpine:latest
Expand All @@ -15,7 +13,6 @@ ENV LANG=C.UTF-8
RUN apk add --no-cache git libffi-dev curl \
python3-dev openssl-dev bash gcc musl-dev tar pkgconfig zstd make rustup

COPY --from=staticnodejs20 /out/ /staticnode/20/
COPY --from=staticnodejs24 /out/ /staticnode/24/

RUN rustup-init -y --default-toolchain stable --profile minimal --component llvm-tools-preview
Expand Down
4 changes: 0 additions & 4 deletions staticnode/node-versions.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
[
{
"version": "v20.19.4",
"sha256sum": "cc363c0a90fe5025939175c1c29ab67235f36ebe4b5d78506634da27a73eef5d"
},
{
"version": "v24.14.1",
"sha256sum": "8298cf1f5774093ca819f41b8dd392fd2cff058688b4d5c8805026352e2d31b3"
Expand Down