diff --git a/build.sh b/build.sh index 2ac9e3d..6be01dc 100644 --- a/build.sh +++ b/build.sh @@ -103,8 +103,8 @@ build_pyside() { latest_tag="$(from-toml-dict "$cfg" "$build.settings" | get-value-of TAG | pass-argument VERSION "${major}-latest")" build_args="$(from-toml-dict "$cfg" "$build.docker-args" | to-docker-args "$repo" "$version")" box-green "Building image $repo:$tag..." - echo "> docker build -t $repo:$tag $build_args --build-arg PYSIDE_VERSION=$version $directory/${build}" - docker build -t "$repo:$tag" $build_args --build-arg PYSIDE_VERSION="$version" "$directory/${build}" + echo "> docker build -t $repo:$tag $build_args $directory/${build}" + docker build -t "$repo:$tag" $build_args "$directory/${build}" # Tag as latest if [ "$latest" != "false" ]; then docker tag "$repo:$tag" "$repo:$latest_tag" diff --git a/pyside2/linux/Dockerfile b/pyside2/linux/Dockerfile index 5d35c10..f35432b 100644 --- a/pyside2/linux/Dockerfile +++ b/pyside2/linux/Dockerfile @@ -14,7 +14,7 @@ FROM ubuntu:jammy # Jammy uses python3.10 and not 3.12, which is not compatible with PySide2. ARG DEBIAN_FRONTEND=noninteractive -ARG PYSIDE_VERSION +ARG PYSIDE_VERSION=5.15.2.1 ENV TZ=Europe/Paris RUN apt-get update diff --git a/pyside2/wine/Dockerfile b/pyside2/wine/Dockerfile index aa31bd2..d8ceaf1 100644 --- a/pyside2/wine/Dockerfile +++ b/pyside2/wine/Dockerfile @@ -12,7 +12,7 @@ FROM ubuntu:noble -ARG PYSIDE_VERSION +ARG PYSIDE_VERSION=5.15.2.1 # Adapted from https://github.com/cdrx/docker-pyinstaller/blob/master/Dockerfile-py3-win64 # Upstream hasn't been updated for a while. diff --git a/pyside6/config.toml b/pyside6/config.toml index aae9be6..0e123ec 100644 --- a/pyside6/config.toml +++ b/pyside6/config.toml @@ -11,7 +11,7 @@ # MAJOR_VERSION="6" -PYSIDE_VERSION="6.7.3" +PYSIDE_VERSION="6.7.2" BUILDS="linux wine linux-latex" [linux.settings] diff --git a/pyside6/linux/Dockerfile b/pyside6/linux/Dockerfile index 37bef04..f7446ad 100644 --- a/pyside6/linux/Dockerfile +++ b/pyside6/linux/Dockerfile @@ -12,7 +12,7 @@ FROM ubuntu:noble ARG DEBIAN_FRONTEND=noninteractive -ARG PYSIDE_VERSION +ARG PYSIDE_VERSION=6.7.2 ENV TZ=Europe/Paris RUN apt-get update diff --git a/pyside6/wine/Dockerfile b/pyside6/wine/Dockerfile index a5fe7c8..03e84c0 100644 --- a/pyside6/wine/Dockerfile +++ b/pyside6/wine/Dockerfile @@ -12,7 +12,7 @@ FROM ubuntu:noble -ARG PYSIDE_VERSION +ARG PYSIDE_VERSION=6.7.2 # Adapted from https://github.com/cdrx/docker-pyinstaller/blob/master/Dockerfile-py3-win64 # Upstream hasn't been updated for a while.