Commit 65e42e1c authored by Fedor Batonogov's avatar Fedor Batonogov
Browse files

Fix VC++ Redist extraction for newer versions and pin action SHAs 

- Extract all cab files dynamically instead of hardcoding a10/a11
- Pin actions/checkout, docker/setup-buildx-action, docker/build-push-action to full SHA
parent 17e0fcc1

.github/workflows/test.yml

+9 −9
Original line number Diff line number Diff line
@@ -14,13 +14,13 @@ jobs: 
    runs-on: ubuntu-latest

    steps:

      - name: Checkout Repo

        uses: actions/checkout@v6.0.2

        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2



      - name: Set up Docker Buildx

        uses: docker/setup-buildx-action@v3

        uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0



      - name: Build Windows image

        uses: docker/build-push-action@v6

        uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2

        with:

          context: .

          file: Dockerfile-py3-windows
@@ -47,13 +47,13 @@ jobs: 
    runs-on: ubuntu-latest

    steps:

      - name: Checkout Repo

        uses: actions/checkout@v6.0.2

        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2



      - name: Set up Docker Buildx

        uses: docker/setup-buildx-action@v3

        uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0



      - name: Build Linux image

        uses: docker/build-push-action@v6

        uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2

        with:

          context: .

          file: Dockerfile-py3-linux
@@ -80,13 +80,13 @@ jobs: 
    runs-on: ubuntu-latest

    steps:

      - name: Checkout Repo

        uses: actions/checkout@v6.0.2

        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2



      - name: Set up Docker Buildx

        uses: docker/setup-buildx-action@v3

        uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0



      - name: Build Linux slim image

        uses: docker/build-push-action@v6

        uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2

        with:

          context: .

          file: Dockerfile-py3-linux-slim

Dockerfile-py3-windows

+2 −2
Original line number Diff line number Diff line
@@ -77,8 +77,8 @@ RUN set -x \ 
    && rm -f "$W_TMP"/* \

    && wget -P "$W_TMP" https://aka.ms/vs/17/release/vc_redist.x64.exe \

    && cabextract -q --directory="$W_TMP" "$W_TMP"/vc_redist.x64.exe \

    && cabextract -q --directory="$W_TMP" "$W_TMP/a10" \

    && cabextract -q --directory="$W_TMP" "$W_TMP/a11" \

    && find "$W_TMP" -maxdepth 1 -type f ! -name '*.exe' ! -name '*.dll' -exec sh -c \

        'cabextract -q --directory="$1" "$2" 2>/dev/null || true' _ "$W_TMP" {} \; \

    && cd "$W_TMP" \

    && rename 's/_/\-/g' *.dll \

    && cp "$W_TMP"/*.dll "$W_SYSTEM64_DLLS"/