Unverified Commit f7ab70fc authored by Федор Батоногов's avatar Федор Батоногов Committed by GitHub
Browse files

Merge branch 'main' into pyinstaller-6.13.0

parents f9d38747 90f60a91

.github/workflows/docker-image-linux-ghcr.yml

+4 −4
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ jobs: 
            linux/ppc64le

            linux/s390x

          push: true

          build-args: PYTHON_VERSION=3.13.2-slim-bookworm

          build-args: PYTHON_VERSION=3.13.3-slim-bookworm

          tags: |

            ${{ steps.meta.outputs.tags }}-slim

            ${{ steps.meta.outputs.tags }}-slim-bookworm
@@ -104,7 +104,7 @@ jobs: 
            linux/arm/v7

            linux/arm64/v8

          push: true

          build-args: PYTHON_VERSION=3.13.2-slim-bullseye

          build-args: PYTHON_VERSION=3.13.3-slim-bullseye

          tags: |

            ${{ steps.meta.outputs.tags }}-slim-bullseye

          labels: |
@@ -127,7 +127,7 @@ jobs: 
            linux/ppc64le

            linux/s390x

          push: true

          build-args: PYTHON_VERSION=3.13.2-bookworm

          build-args: PYTHON_VERSION=3.13.3-bookworm

          tags: |

            ${{ steps.meta.outputs.tags }}

            ${{ steps.meta.outputs.tags }}-bookworm
@@ -149,7 +149,7 @@ jobs: 
            linux/arm/v7

            linux/arm64/v8

          push: true

          build-args: PYTHON_VERSION=3.13.2-bullseye

          build-args: PYTHON_VERSION=3.13.3-bullseye

          tags: |

            ${{ steps.meta.outputs.tags }}-bullseye

          labels: |

.github/workflows/docker-image-linux.yml

+4 −4
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ jobs: 
            linux/ppc64le

            linux/s390x

          push: true

          build-args: PYTHON_VERSION=3.13.2-slim-bookworm

          build-args: PYTHON_VERSION=3.13.3-slim-bookworm

          tags: |

            ${{ secrets.DOCKERHUB_USERNAME }}/pyinstaller-linux:${{ github.ref_name }}-slim

            ${{ secrets.DOCKERHUB_USERNAME }}/pyinstaller-linux:${{ github.ref_name }}-slim-bookworm
@@ -52,7 +52,7 @@ jobs: 
            linux/arm/v7

            linux/arm64/v8

          push: true

          build-args: PYTHON_VERSION=3.13.2-slim-bullseye

          build-args: PYTHON_VERSION=3.13.3-slim-bullseye

          tags: |

            ${{ secrets.DOCKERHUB_USERNAME }}/pyinstaller-linux:${{ github.ref_name }}-slim-bullseye
@@ -69,7 +69,7 @@ jobs: 
            linux/ppc64le

            linux/s390x

          push: true

          build-args: PYTHON_VERSION=3.13.2-bookworm

          build-args: PYTHON_VERSION=3.13.3-bookworm

          tags: |

            ${{ secrets.DOCKERHUB_USERNAME }}/pyinstaller-linux:${{ github.ref_name }}

            ${{ secrets.DOCKERHUB_USERNAME }}/pyinstaller-linux:${{ github.ref_name }}-bookworm
@@ -85,6 +85,6 @@ jobs: 
            linux/arm/v7

            linux/arm64/v8

          push: true

          build-args: PYTHON_VERSION=3.13.2-bullseye

          build-args: PYTHON_VERSION=3.13.3-bullseye

          tags: |

            ${{ secrets.DOCKERHUB_USERNAME }}/pyinstaller-linux:${{ github.ref_name }}-bullseye

Dockerfile-py3-linux

+1 −1
Original line number Diff line number Diff line 
# Use ARG to set the Python version

ARG PYTHON_VERSION=3.13.2

ARG PYTHON_VERSION=3.13.3

FROM python:${PYTHON_VERSION}

SHELL ["/bin/bash", "-i", "-c"]

Dockerfile-py3-linux-slim

+1 −1
Original line number Diff line number Diff line 
# Define Python version as an argument, using the slim variant for a smaller image

ARG PYTHON_VERSION=3.13.2-slim

ARG PYTHON_VERSION=3.13.3-slim

FROM python:${PYTHON_VERSION}

SHELL ["/bin/bash", "-i", "-c"]

Dockerfile-py3-windows

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ ENV DEBIAN_FRONTEND=noninteractive 


ARG WINE_VERSION=winehq-devel



ARG PYTHON_VERSION=3.13.2

ARG PYTHON_VERSION=3.13.3

ARG PYINSTALLER_VERSION=6.13.0



# we need wine for this all to work, so we'll use the PPA