Ad5001/docker-ubuntu-pyside-xvfb
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixing changing PySide versions in TOML files

Browse source
This commit is contained in:
Adsooi 2024-10-01 22:38:44 +02:00
parent 104b483c3d
commit c139952685
Signed by: Ad5001
GPG key ID: EF45F9C6AFE20160
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build.sh
View file

@ -103,8 +103,8 @@ build_pyside() {
latest_tag="$(from-toml-dict "$cfg" "$build.settings" | get-value-of TAG | pass-argument VERSION "${major}-latest")" 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")" build_args="$(from-toml-dict "$cfg" "$build.docker-args" | to-docker-args "$repo" "$version")"
box-green "Building image $repo:$tag..." box-green "Building image $repo:$tag..."
echo "> docker build -t $repo:$tag $build_args $directory/${build}" echo "> docker build -t $repo:$tag $build_args --build-arg PYSIDE_VERSION=$version $directory/${build}"
docker build -t "$repo:$tag" $build_args "$directory/${build}" docker build -t "$repo:$tag" $build_args --build-arg PYSIDE_VERSION="$version" "$directory/${build}"
# Tag as latest # Tag as latest
if [ "$latest" != "false" ]; then if [ "$latest" != "false" ]; then
docker tag "$repo:$tag" "$repo:$latest_tag" docker tag "$repo:$tag" "$repo:$latest_tag"

2
pyside2/linux/Dockerfile
View file

@ -14,7 +14,7 @@ FROM ubuntu:jammy
# Jammy uses python3.10 and not 3.12, which is not compatible with PySide2. # Jammy uses python3.10 and not 3.12, which is not compatible with PySide2.
ARG DEBIAN_FRONTEND=noninteractive ARG DEBIAN_FRONTEND=noninteractive
ARG PYSIDE_VERSION=5.15.2.1 ARG PYSIDE_VERSION
ENV TZ=Europe/Paris ENV TZ=Europe/Paris
RUN apt-get update RUN apt-get update

2
pyside2/wine/Dockerfile
View file

@ -12,7 +12,7 @@
FROM ubuntu:noble FROM ubuntu:noble
ARG PYSIDE_VERSION=5.15.2.1 ARG PYSIDE_VERSION
# Adapted from https://github.com/cdrx/docker-pyinstaller/blob/master/Dockerfile-py3-win64 # Adapted from https://github.com/cdrx/docker-pyinstaller/blob/master/Dockerfile-py3-win64
# Upstream hasn't been updated for a while. # Upstream hasn't been updated for a while.

2
pyside6/linux/Dockerfile
View file

@ -12,7 +12,7 @@
FROM ubuntu:noble FROM ubuntu:noble
ARG DEBIAN_FRONTEND=noninteractive ARG DEBIAN_FRONTEND=noninteractive
ARG PYSIDE_VERSION=6.7.2 ARG PYSIDE_VERSION
ENV TZ=Europe/Paris ENV TZ=Europe/Paris
RUN apt-get update RUN apt-get update

2
pyside6/wine/Dockerfile
View file

@ -12,7 +12,7 @@
FROM ubuntu:noble FROM ubuntu:noble
ARG PYSIDE_VERSION=6.7.2 ARG PYSIDE_VERSION
# Adapted from https://github.com/cdrx/docker-pyinstaller/blob/master/Dockerfile-py3-win64 # Adapted from https://github.com/cdrx/docker-pyinstaller/blob/master/Dockerfile-py3-win64
# Upstream hasn't been updated for a while. # Upstream hasn't been updated for a while.