diff options
| author | Mehmet Samet Duman <yongdohyun@mail.projecttick.org> | 2026-02-18 21:07:17 +0300 |
|---|---|---|
| committer | Mehmet Samet Duman <yongdohyun@mail.projecttick.org> | 2026-02-18 21:07:17 +0300 |
| commit | cd1e3bfa2ff5c2515ee1f18fe2d88f8847b2dcb0 (patch) | |
| tree | 6f8f354e6c94d09e8dd42a546e9c7fa3d027c877 | |
| parent | caac562ffcc1c2c565438a086a26300906cc31a3 (diff) | |
| download | Project-Tick-cd1e3bfa2ff5c2515ee1f18fe2d88f8847b2dcb0.tar.gz Project-Tick-cd1e3bfa2ff5c2515ee1f18fe2d88f8847b2dcb0.zip | |
Update Dockerfiles to improve Qt toolchain detection and package installation commands
- Modified the command checks for Qt toolchain to include `qmake-qt6` and `qtpaths6` across multiple Dockerfiles.
- Ensured consistent package installation commands and cleanup procedures in various Dockerfiles for Debian, Devuan, Fedora, Gentoo, Kali, Nix, OpenSUSE, Oracle Linux, Rocky, and Ubuntu images.
Signed-off-by: Mehmet Samet Duman <yongdohyun@mail.projecttick.org>
42 files changed, 43 insertions, 43 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 042cdd3425..1a62687575 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,10 +25,10 @@ jobs: run: | set -euo pipefail - APT_CUSTOM='apt-get update && apt-get install -y --no-install-recommends dpkg-dev ninja-build scdoc appstream libxcb-cursor-dev openjdk-21-jdk lcov libdbus-1-dev libinih-dev libsystemd-dev qt6-base-dev qt6-declarative-dev qt6-tools-dev qt6-tools-dev-tools && if apt-cache show libtiff6 >/dev/null 2>&1; then apt-get install -y --no-install-recommends libtiff6; else apt-get install -y --no-install-recommends libtiff5; fi' + APT_CUSTOM='set -eu; apt-get update; PKGS="dpkg-dev ninja-build scdoc appstream lcov libdbus-1-dev libinih-dev libsystemd-dev"; if apt-cache show libxcb-cursor-dev >/dev/null 2>&1; then PKGS="$PKGS libxcb-cursor-dev"; elif apt-cache show libxcb-cursor0-dev >/dev/null 2>&1; then PKGS="$PKGS libxcb-cursor0-dev"; fi; if apt-cache show openjdk-21-jdk >/dev/null 2>&1; then PKGS="$PKGS openjdk-21-jdk"; elif apt-cache show openjdk-17-jdk >/dev/null 2>&1; then PKGS="$PKGS openjdk-17-jdk"; else PKGS="$PKGS default-jdk"; fi; if apt-cache show qt6-base-dev >/dev/null 2>&1 && apt-cache show qt6-declarative-dev >/dev/null 2>&1 && apt-cache show qt6-tools-dev >/dev/null 2>&1; then PKGS="$PKGS qt6-base-dev qt6-declarative-dev qt6-tools-dev qt6-tools-dev-tools"; else echo "Qt6 dev packages are required but not available" >&2; exit 1; fi; if apt-cache show libtiff6 >/dev/null 2>&1; then PKGS="$PKGS libtiff6"; elif apt-cache show libtiff5 >/dev/null 2>&1; then PKGS="$PKGS libtiff5"; else PKGS="$PKGS libtiff-dev"; fi; apt-get install -y --no-install-recommends $PKGS' APK_PACKAGES='ninja scdoc appstream libxcb openjdk21-jdk lcov dbus-dev inih-dev libsystemd-dev tiff-dev qt6-qtbase-dev qt6-qtdeclarative-dev qt6-qttools-dev' DNF_PACKAGES='ninja-build scdoc appstream libxcb-devel java-21-openjdk-devel lcov dbus-devel inih-devel systemd-devel libtiff qt6-qtbase-devel qt6-qtdeclarative-devel qt6-qttools-devel' - YUM_CUSTOM='yum install -y ninja-build scdoc lcov dbus-devel systemd-devel libtiff qt5-qtbase-devel qt5-qtdeclarative-devel qt5-qttools-devel && (yum install -y java-21-openjdk-devel || yum install -y java-17-openjdk-devel)' + YUM_CUSTOM='yum install -y ninja-build scdoc lcov dbus-devel systemd-devel libtiff qt6-qtbase-devel qt6-qtdeclarative-devel qt6-qttools-devel && (yum install -y java-21-openjdk-devel || yum install -y java-17-openjdk-devel)' ZYPPER_PACKAGES='ninja scdoc appstream libxcb-devel java-21-openjdk-devel lcov dbus-1-devel inih-devel systemd-devel libtiff qt6-base-devel qt6-declarative-devel qt6-tools-devel' PACMAN_PACKAGES='base-devel ninja scdoc appstream libxcb jdk21-openjdk lcov dbus inih systemd-libs libtiff qt6-base qt6-declarative qt6-tools' XBPS_PACKAGES='ninja scdoc appstream libxcb-devel openjdk21 lcov dbus-devel inih-devel libsystemd-devel tiff-devel qt6-base-devel qt6-declarative-devel qt6-tools-devel' @@ -28,5 +28,5 @@ Package profile highlights: - `yum`/`pacman`/`xbps`/`nix`/`emerge`: mapped best-effort equivalents + Qt ## Notes -- If Qt tools are not found during build, Docker build fails. +- Qt6 is mandatory. If Qt6 packages/tools are unavailable, Docker build fails (no Qt5 fallback). - If an upstream image tag disappears, update the corresponding file in `dockerfiles/`. diff --git a/dockerfiles/alma-10.Dockerfile b/dockerfiles/alma-10.Dockerfile index c4a84c847a..d1a35bcb78 100644 --- a/dockerfiles/alma-10.Dockerfile +++ b/dockerfiles/alma-10.Dockerfile @@ -8,6 +8,6 @@ ARG CLEAN_CMD= SHELL ["/bin/sh", "-lc"] -RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then dnf install -y ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else dnf clean all || true; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1 || command -v qtpaths >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi +RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then dnf install -y ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else dnf clean all || true; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake-qt6 >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi CMD ["/bin/sh"] diff --git a/dockerfiles/alma-9.Dockerfile b/dockerfiles/alma-9.Dockerfile index bfe192feca..96961bccc7 100644 --- a/dockerfiles/alma-9.Dockerfile +++ b/dockerfiles/alma-9.Dockerfile @@ -8,6 +8,6 @@ ARG CLEAN_CMD= SHELL ["/bin/sh", "-lc"] -RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then dnf install -y ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else dnf clean all || true; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1 || command -v qtpaths >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi +RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then dnf install -y ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else dnf clean all || true; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake-qt6 >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi CMD ["/bin/sh"] diff --git a/dockerfiles/alpine-319.Dockerfile b/dockerfiles/alpine-319.Dockerfile index 73b04041fd..0e4ac9a732 100644 --- a/dockerfiles/alpine-319.Dockerfile +++ b/dockerfiles/alpine-319.Dockerfile @@ -8,6 +8,6 @@ ARG CLEAN_CMD= SHELL ["/bin/sh", "-lc"] -RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then apk add --no-cache ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else true; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1 || command -v qtpaths >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi +RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then apk add --no-cache ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else true; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake-qt6 >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi CMD ["/bin/sh"] diff --git a/dockerfiles/alpine-320.Dockerfile b/dockerfiles/alpine-320.Dockerfile index 9840e92338..bcf87355bf 100644 --- a/dockerfiles/alpine-320.Dockerfile +++ b/dockerfiles/alpine-320.Dockerfile @@ -8,6 +8,6 @@ ARG CLEAN_CMD= SHELL ["/bin/sh", "-lc"] -RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then apk add --no-cache ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else true; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1 || command -v qtpaths >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi +RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then apk add --no-cache ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else true; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake-qt6 >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi CMD ["/bin/sh"] diff --git a/dockerfiles/alpine-321.Dockerfile b/dockerfiles/alpine-321.Dockerfile index e37853c824..16d8f69f05 100644 --- a/dockerfiles/alpine-321.Dockerfile +++ b/dockerfiles/alpine-321.Dockerfile @@ -8,6 +8,6 @@ ARG CLEAN_CMD= SHELL ["/bin/sh", "-lc"] -RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then apk add --no-cache ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else true; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1 || command -v qtpaths >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi +RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then apk add --no-cache ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else true; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake-qt6 >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi CMD ["/bin/sh"] diff --git a/dockerfiles/alpine-322.Dockerfile b/dockerfiles/alpine-322.Dockerfile index d97a76bb39..47e2b727b4 100644 --- a/dockerfiles/alpine-322.Dockerfile +++ b/dockerfiles/alpine-322.Dockerfile @@ -8,6 +8,6 @@ ARG CLEAN_CMD= SHELL ["/bin/sh", "-lc"] -RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then apk add --no-cache ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else true; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1 || command -v qtpaths >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi +RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then apk add --no-cache ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else true; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake-qt6 >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi CMD ["/bin/sh"] diff --git a/dockerfiles/alpine-latest.Dockerfile b/dockerfiles/alpine-latest.Dockerfile index c5d77b93d4..fc5d1a907c 100644 --- a/dockerfiles/alpine-latest.Dockerfile +++ b/dockerfiles/alpine-latest.Dockerfile @@ -8,6 +8,6 @@ ARG CLEAN_CMD= SHELL ["/bin/sh", "-lc"] -RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then apk add --no-cache ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else true; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1 || command -v qtpaths >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi +RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then apk add --no-cache ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else true; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake-qt6 >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi CMD ["/bin/sh"] diff --git a/dockerfiles/amazonlinux-2.Dockerfile b/dockerfiles/amazonlinux-2.Dockerfile index 9eda44020a..cd5719e058 100644 --- a/dockerfiles/amazonlinux-2.Dockerfile +++ b/dockerfiles/amazonlinux-2.Dockerfile @@ -8,6 +8,6 @@ ARG CLEAN_CMD= SHELL ["/bin/sh", "-lc"] -RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then yum install -y ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else yum clean all || true; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1 || command -v qtpaths >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi +RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then yum install -y ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else yum clean all || true; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake-qt6 >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi CMD ["/bin/sh"] diff --git a/dockerfiles/amazonlinux-2023.Dockerfile b/dockerfiles/amazonlinux-2023.Dockerfile index 46a2393992..5026e749fa 100644 --- a/dockerfiles/amazonlinux-2023.Dockerfile +++ b/dockerfiles/amazonlinux-2023.Dockerfile @@ -8,6 +8,6 @@ ARG CLEAN_CMD= SHELL ["/bin/sh", "-lc"] -RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then dnf install -y ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else dnf clean all || true; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1 || command -v qtpaths >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi +RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then dnf install -y ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else dnf clean all || true; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake-qt6 >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi CMD ["/bin/sh"] diff --git a/dockerfiles/arch-latest.Dockerfile b/dockerfiles/arch-latest.Dockerfile index bcefc7d1ce..efa6e1e5d6 100644 --- a/dockerfiles/arch-latest.Dockerfile +++ b/dockerfiles/arch-latest.Dockerfile @@ -8,6 +8,6 @@ ARG CLEAN_CMD= SHELL ["/bin/sh", "-lc"] -RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then pacman -Syu --noconfirm --needed ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else pacman -Scc --noconfirm || true; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1 || command -v qtpaths >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi +RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then pacman -Syu --noconfirm --needed ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else pacman -Scc --noconfirm || true; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake-qt6 >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi CMD ["/bin/sh"] diff --git a/dockerfiles/centos-stream10.Dockerfile b/dockerfiles/centos-stream10.Dockerfile index e09312cdde..fa98a44bf3 100644 --- a/dockerfiles/centos-stream10.Dockerfile +++ b/dockerfiles/centos-stream10.Dockerfile @@ -8,6 +8,6 @@ ARG CLEAN_CMD= SHELL ["/bin/sh", "-lc"] -RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then dnf install -y ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else dnf clean all || true; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1 || command -v qtpaths >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi +RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then dnf install -y ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else dnf clean all || true; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake-qt6 >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi CMD ["/bin/sh"] diff --git a/dockerfiles/centos-stream9.Dockerfile b/dockerfiles/centos-stream9.Dockerfile index 8d0d157993..e5f26d6f48 100644 --- a/dockerfiles/centos-stream9.Dockerfile +++ b/dockerfiles/centos-stream9.Dockerfile @@ -8,6 +8,6 @@ ARG CLEAN_CMD= SHELL ["/bin/sh", "-lc"] -RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then dnf install -y ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else dnf clean all || true; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1 || command -v qtpaths >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi +RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then dnf install -y ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else dnf clean all || true; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake-qt6 >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi CMD ["/bin/sh"] diff --git a/dockerfiles/debian-bookworm-slim.Dockerfile b/dockerfiles/debian-bookworm-slim.Dockerfile index 3d952f9f24..6efe651fbe 100644 --- a/dockerfiles/debian-bookworm-slim.Dockerfile +++ b/dockerfiles/debian-bookworm-slim.Dockerfile @@ -8,6 +8,6 @@ ARG CLEAN_CMD= SHELL ["/bin/sh", "-lc"] -RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then apt-get update; apt-get install -y --no-install-recommends ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else rm -rf /var/lib/apt/lists/*; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1 || command -v qtpaths >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi +RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then apt-get update; apt-get install -y --no-install-recommends ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else rm -rf /var/lib/apt/lists/*; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake-qt6 >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi CMD ["/bin/sh"] diff --git a/dockerfiles/debian-bookworm.Dockerfile b/dockerfiles/debian-bookworm.Dockerfile index df66238883..d93b7df17b 100644 --- a/dockerfiles/debian-bookworm.Dockerfile +++ b/dockerfiles/debian-bookworm.Dockerfile @@ -8,6 +8,6 @@ ARG CLEAN_CMD= SHELL ["/bin/sh", "-lc"] -RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then apt-get update; apt-get install -y --no-install-recommends ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else rm -rf /var/lib/apt/lists/*; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1 || command -v qtpaths >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi +RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then apt-get update; apt-get install -y --no-install-recommends ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else rm -rf /var/lib/apt/lists/*; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake-qt6 >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi CMD ["/bin/sh"] diff --git a/dockerfiles/debian-bullseye-slim.Dockerfile b/dockerfiles/debian-bullseye-slim.Dockerfile index aaf4f08aec..cc4f8cb407 100644 --- a/dockerfiles/debian-bullseye-slim.Dockerfile +++ b/dockerfiles/debian-bullseye-slim.Dockerfile @@ -8,6 +8,6 @@ ARG CLEAN_CMD= SHELL ["/bin/sh", "-lc"] -RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then apt-get update; apt-get install -y --no-install-recommends ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else rm -rf /var/lib/apt/lists/*; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1 || command -v qtpaths >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi +RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then apt-get update; apt-get install -y --no-install-recommends ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else rm -rf /var/lib/apt/lists/*; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake-qt6 >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi CMD ["/bin/sh"] diff --git a/dockerfiles/debian-bullseye.Dockerfile b/dockerfiles/debian-bullseye.Dockerfile index ae69553cd5..230d828ab9 100644 --- a/dockerfiles/debian-bullseye.Dockerfile +++ b/dockerfiles/debian-bullseye.Dockerfile @@ -8,6 +8,6 @@ ARG CLEAN_CMD= SHELL ["/bin/sh", "-lc"] -RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then apt-get update; apt-get install -y --no-install-recommends ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else rm -rf /var/lib/apt/lists/*; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1 || command -v qtpaths >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi +RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then apt-get update; apt-get install -y --no-install-recommends ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else rm -rf /var/lib/apt/lists/*; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake-qt6 >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi CMD ["/bin/sh"] diff --git a/dockerfiles/debian-stable-slim.Dockerfile b/dockerfiles/debian-stable-slim.Dockerfile index 13f5357884..3a42f8702f 100644 --- a/dockerfiles/debian-stable-slim.Dockerfile +++ b/dockerfiles/debian-stable-slim.Dockerfile @@ -8,6 +8,6 @@ ARG CLEAN_CMD= SHELL ["/bin/sh", "-lc"] -RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then apt-get update; apt-get install -y --no-install-recommends ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else rm -rf /var/lib/apt/lists/*; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1 || command -v qtpaths >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi +RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then apt-get update; apt-get install -y --no-install-recommends ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else rm -rf /var/lib/apt/lists/*; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake-qt6 >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi CMD ["/bin/sh"] diff --git a/dockerfiles/debian-trixie-slim.Dockerfile b/dockerfiles/debian-trixie-slim.Dockerfile index 2ebb1b155e..a8874e96d7 100644 --- a/dockerfiles/debian-trixie-slim.Dockerfile +++ b/dockerfiles/debian-trixie-slim.Dockerfile @@ -8,6 +8,6 @@ ARG CLEAN_CMD= SHELL ["/bin/sh", "-lc"] -RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then apt-get update; apt-get install -y --no-install-recommends ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else rm -rf /var/lib/apt/lists/*; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1 || command -v qtpaths >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi +RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then apt-get update; apt-get install -y --no-install-recommends ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else rm -rf /var/lib/apt/lists/*; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake-qt6 >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi CMD ["/bin/sh"] diff --git a/dockerfiles/devuan-chimaera.Dockerfile b/dockerfiles/devuan-chimaera.Dockerfile index 7179fadc76..76ebd4fe5f 100644 --- a/dockerfiles/devuan-chimaera.Dockerfile +++ b/dockerfiles/devuan-chimaera.Dockerfile @@ -8,6 +8,6 @@ ARG CLEAN_CMD= SHELL ["/bin/sh", "-lc"] -RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then apt-get update; apt-get install -y --no-install-recommends ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else rm -rf /var/lib/apt/lists/*; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1 || command -v qtpaths >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi +RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then apt-get update; apt-get install -y --no-install-recommends ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else rm -rf /var/lib/apt/lists/*; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake-qt6 >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi CMD ["/bin/sh"] diff --git a/dockerfiles/devuan-daedalus.Dockerfile b/dockerfiles/devuan-daedalus.Dockerfile index a1ef86ddb0..2aa4884bbf 100644 --- a/dockerfiles/devuan-daedalus.Dockerfile +++ b/dockerfiles/devuan-daedalus.Dockerfile @@ -8,6 +8,6 @@ ARG CLEAN_CMD= SHELL ["/bin/sh", "-lc"] -RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then apt-get update; apt-get install -y --no-install-recommends ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else rm -rf /var/lib/apt/lists/*; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1 || command -v qtpaths >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi +RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then apt-get update; apt-get install -y --no-install-recommends ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else rm -rf /var/lib/apt/lists/*; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake-qt6 >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi CMD ["/bin/sh"] diff --git a/dockerfiles/fedora-40.Dockerfile b/dockerfiles/fedora-40.Dockerfile index 6bb5fa7f0d..14cede91dd 100644 --- a/dockerfiles/fedora-40.Dockerfile +++ b/dockerfiles/fedora-40.Dockerfile @@ -8,6 +8,6 @@ ARG CLEAN_CMD= SHELL ["/bin/sh", "-lc"] -RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then dnf install -y ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else dnf clean all || true; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1 || command -v qtpaths >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi +RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then dnf install -y ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else dnf clean all || true; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake-qt6 >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi CMD ["/bin/sh"] diff --git a/dockerfiles/fedora-41.Dockerfile b/dockerfiles/fedora-41.Dockerfile index d42eac4f17..bdefd34fed 100644 --- a/dockerfiles/fedora-41.Dockerfile +++ b/dockerfiles/fedora-41.Dockerfile @@ -8,6 +8,6 @@ ARG CLEAN_CMD= SHELL ["/bin/sh", "-lc"] -RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then dnf install -y ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else dnf clean all || true; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1 || command -v qtpaths >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi +RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then dnf install -y ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else dnf clean all || true; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake-qt6 >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi CMD ["/bin/sh"] diff --git a/dockerfiles/fedora-42.Dockerfile b/dockerfiles/fedora-42.Dockerfile index d8b95df61f..b940bfcd6a 100644 --- a/dockerfiles/fedora-42.Dockerfile +++ b/dockerfiles/fedora-42.Dockerfile @@ -8,6 +8,6 @@ ARG CLEAN_CMD= SHELL ["/bin/sh", "-lc"] -RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then dnf install -y ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else dnf clean all || true; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1 || command -v qtpaths >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi +RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then dnf install -y ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else dnf clean all || true; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake-qt6 >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi CMD ["/bin/sh"] diff --git a/dockerfiles/fedora-latest.Dockerfile b/dockerfiles/fedora-latest.Dockerfile index 02ca6d2b0d..7fbbe1ed9f 100644 --- a/dockerfiles/fedora-latest.Dockerfile +++ b/dockerfiles/fedora-latest.Dockerfile @@ -8,6 +8,6 @@ ARG CLEAN_CMD= SHELL ["/bin/sh", "-lc"] -RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then dnf install -y ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else dnf clean all || true; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1 || command -v qtpaths >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi +RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then dnf install -y ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else dnf clean all || true; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake-qt6 >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi CMD ["/bin/sh"] diff --git a/dockerfiles/gentoo-stage3.Dockerfile b/dockerfiles/gentoo-stage3.Dockerfile index 7f7de1bf6e..72cfd35e9c 100644 --- a/dockerfiles/gentoo-stage3.Dockerfile +++ b/dockerfiles/gentoo-stage3.Dockerfile @@ -8,6 +8,6 @@ ARG CLEAN_CMD= SHELL ["/bin/sh", "-lc"] -RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then emerge --sync; emerge ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else true; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1 || command -v qtpaths >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi +RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then emerge --sync; emerge ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else true; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake-qt6 >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi CMD ["/bin/sh"] diff --git a/dockerfiles/kali-rolling.Dockerfile b/dockerfiles/kali-rolling.Dockerfile index 8bcb7e2607..555a2e4b89 100644 --- a/dockerfiles/kali-rolling.Dockerfile +++ b/dockerfiles/kali-rolling.Dockerfile @@ -8,6 +8,6 @@ ARG CLEAN_CMD= SHELL ["/bin/sh", "-lc"] -RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then apt-get update; apt-get install -y --no-install-recommends ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else rm -rf /var/lib/apt/lists/*; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1 || command -v qtpaths >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi +RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then apt-get update; apt-get install -y --no-install-recommends ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else rm -rf /var/lib/apt/lists/*; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake-qt6 >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi CMD ["/bin/sh"] diff --git a/dockerfiles/nix-latest.Dockerfile b/dockerfiles/nix-latest.Dockerfile index 2d85106bb2..c6ab5438a6 100644 --- a/dockerfiles/nix-latest.Dockerfile +++ b/dockerfiles/nix-latest.Dockerfile @@ -8,6 +8,6 @@ ARG CLEAN_CMD= SHELL ["/bin/sh", "-lc"] -RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then nix-env -iA ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else nix-collect-garbage -d || true; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1 || command -v qtpaths >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi +RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then nix-env -iA ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else nix-collect-garbage -d || true; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake-qt6 >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi CMD ["/bin/sh"] diff --git a/dockerfiles/opensuse-leap-155.Dockerfile b/dockerfiles/opensuse-leap-155.Dockerfile index 6b04927e09..55d6cb3392 100644 --- a/dockerfiles/opensuse-leap-155.Dockerfile +++ b/dockerfiles/opensuse-leap-155.Dockerfile @@ -8,6 +8,6 @@ ARG CLEAN_CMD= SHELL ["/bin/sh", "-lc"] -RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then zypper --non-interactive refresh; zypper --non-interactive install --no-recommends ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else zypper clean --all || true; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1 || command -v qtpaths >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi +RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then zypper --non-interactive refresh; zypper --non-interactive install --no-recommends ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else zypper clean --all || true; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake-qt6 >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi CMD ["/bin/sh"] diff --git a/dockerfiles/opensuse-leap-156.Dockerfile b/dockerfiles/opensuse-leap-156.Dockerfile index 0c445c3f01..5c7ad0dea0 100644 --- a/dockerfiles/opensuse-leap-156.Dockerfile +++ b/dockerfiles/opensuse-leap-156.Dockerfile @@ -8,6 +8,6 @@ ARG CLEAN_CMD= SHELL ["/bin/sh", "-lc"] -RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then zypper --non-interactive refresh; zypper --non-interactive install --no-recommends ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else zypper clean --all || true; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1 || command -v qtpaths >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi +RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then zypper --non-interactive refresh; zypper --non-interactive install --no-recommends ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else zypper clean --all || true; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake-qt6 >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi CMD ["/bin/sh"] diff --git a/dockerfiles/opensuse-tumbleweed.Dockerfile b/dockerfiles/opensuse-tumbleweed.Dockerfile index e87529780a..cf8e4eb6c2 100644 --- a/dockerfiles/opensuse-tumbleweed.Dockerfile +++ b/dockerfiles/opensuse-tumbleweed.Dockerfile @@ -8,6 +8,6 @@ ARG CLEAN_CMD= SHELL ["/bin/sh", "-lc"] -RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then zypper --non-interactive refresh; zypper --non-interactive install --no-recommends ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else zypper clean --all || true; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1 || command -v qtpaths >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi +RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then zypper --non-interactive refresh; zypper --non-interactive install --no-recommends ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else zypper clean --all || true; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake-qt6 >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi CMD ["/bin/sh"] diff --git a/dockerfiles/oraclelinux-10.Dockerfile b/dockerfiles/oraclelinux-10.Dockerfile index 6300bc46e1..e613c8f175 100644 --- a/dockerfiles/oraclelinux-10.Dockerfile +++ b/dockerfiles/oraclelinux-10.Dockerfile @@ -8,6 +8,6 @@ ARG CLEAN_CMD= SHELL ["/bin/sh", "-lc"] -RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then dnf install -y ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else dnf clean all || true; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1 || command -v qtpaths >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi +RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then dnf install -y ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else dnf clean all || true; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake-qt6 >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi CMD ["/bin/sh"] diff --git a/dockerfiles/oraclelinux-8.Dockerfile b/dockerfiles/oraclelinux-8.Dockerfile index ffb926671e..11cc0ee10e 100644 --- a/dockerfiles/oraclelinux-8.Dockerfile +++ b/dockerfiles/oraclelinux-8.Dockerfile @@ -8,6 +8,6 @@ ARG CLEAN_CMD= SHELL ["/bin/sh", "-lc"] -RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then dnf install -y ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else dnf clean all || true; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1 || command -v qtpaths >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi +RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then dnf install -y ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else dnf clean all || true; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake-qt6 >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi CMD ["/bin/sh"] diff --git a/dockerfiles/oraclelinux-9.Dockerfile b/dockerfiles/oraclelinux-9.Dockerfile index 73ac3a42e5..4a0d1e4fd4 100644 --- a/dockerfiles/oraclelinux-9.Dockerfile +++ b/dockerfiles/oraclelinux-9.Dockerfile @@ -8,6 +8,6 @@ ARG CLEAN_CMD= SHELL ["/bin/sh", "-lc"] -RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then dnf install -y ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else dnf clean all || true; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1 || command -v qtpaths >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi +RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then dnf install -y ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else dnf clean all || true; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake-qt6 >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi CMD ["/bin/sh"] diff --git a/dockerfiles/rocky-10.Dockerfile b/dockerfiles/rocky-10.Dockerfile index 59d7e767c1..fbcd7a23f3 100644 --- a/dockerfiles/rocky-10.Dockerfile +++ b/dockerfiles/rocky-10.Dockerfile @@ -8,6 +8,6 @@ ARG CLEAN_CMD= SHELL ["/bin/sh", "-lc"] -RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then dnf install -y ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else dnf clean all || true; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1 || command -v qtpaths >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi +RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then dnf install -y ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else dnf clean all || true; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake-qt6 >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi CMD ["/bin/sh"] diff --git a/dockerfiles/rocky-9.Dockerfile b/dockerfiles/rocky-9.Dockerfile index b6802cc666..49bf0937ac 100644 --- a/dockerfiles/rocky-9.Dockerfile +++ b/dockerfiles/rocky-9.Dockerfile @@ -8,6 +8,6 @@ ARG CLEAN_CMD= SHELL ["/bin/sh", "-lc"] -RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then dnf install -y ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else dnf clean all || true; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1 || command -v qtpaths >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi +RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then dnf install -y ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else dnf clean all || true; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake-qt6 >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi CMD ["/bin/sh"] diff --git a/dockerfiles/ubuntu-2004.Dockerfile b/dockerfiles/ubuntu-2004.Dockerfile index 8d0272ce5d..3d4fa5ae78 100644 --- a/dockerfiles/ubuntu-2004.Dockerfile +++ b/dockerfiles/ubuntu-2004.Dockerfile @@ -8,6 +8,6 @@ ARG CLEAN_CMD= SHELL ["/bin/sh", "-lc"] -RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then apt-get update; apt-get install -y --no-install-recommends ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else rm -rf /var/lib/apt/lists/*; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1 || command -v qtpaths >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi +RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then apt-get update; apt-get install -y --no-install-recommends ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else rm -rf /var/lib/apt/lists/*; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake-qt6 >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi CMD ["/bin/sh"] diff --git a/dockerfiles/ubuntu-2204.Dockerfile b/dockerfiles/ubuntu-2204.Dockerfile index 3d9852dd17..d52d4884c9 100644 --- a/dockerfiles/ubuntu-2204.Dockerfile +++ b/dockerfiles/ubuntu-2204.Dockerfile @@ -8,6 +8,6 @@ ARG CLEAN_CMD= SHELL ["/bin/sh", "-lc"] -RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then apt-get update; apt-get install -y --no-install-recommends ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else rm -rf /var/lib/apt/lists/*; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1 || command -v qtpaths >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi +RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then apt-get update; apt-get install -y --no-install-recommends ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else rm -rf /var/lib/apt/lists/*; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake-qt6 >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi CMD ["/bin/sh"] diff --git a/dockerfiles/ubuntu-2404.Dockerfile b/dockerfiles/ubuntu-2404.Dockerfile index 5f6fc71246..24073d74ac 100644 --- a/dockerfiles/ubuntu-2404.Dockerfile +++ b/dockerfiles/ubuntu-2404.Dockerfile @@ -8,6 +8,6 @@ ARG CLEAN_CMD= SHELL ["/bin/sh", "-lc"] -RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then apt-get update; apt-get install -y --no-install-recommends ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else rm -rf /var/lib/apt/lists/*; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1 || command -v qtpaths >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi +RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then apt-get update; apt-get install -y --no-install-recommends ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else rm -rf /var/lib/apt/lists/*; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake-qt6 >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi CMD ["/bin/sh"] diff --git a/dockerfiles/ubuntu-latest.Dockerfile b/dockerfiles/ubuntu-latest.Dockerfile index a3f1155642..4c0a2d5f1e 100644 --- a/dockerfiles/ubuntu-latest.Dockerfile +++ b/dockerfiles/ubuntu-latest.Dockerfile @@ -8,6 +8,6 @@ ARG CLEAN_CMD= SHELL ["/bin/sh", "-lc"] -RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then apt-get update; apt-get install -y --no-install-recommends ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else rm -rf /var/lib/apt/lists/*; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1 || command -v qtpaths >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi +RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then apt-get update; apt-get install -y --no-install-recommends ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else rm -rf /var/lib/apt/lists/*; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake-qt6 >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi CMD ["/bin/sh"] diff --git a/dockerfiles/void-latest.Dockerfile b/dockerfiles/void-latest.Dockerfile index ab6d0ecfca..d7bdd0bdd7 100644 --- a/dockerfiles/void-latest.Dockerfile +++ b/dockerfiles/void-latest.Dockerfile @@ -8,6 +8,6 @@ ARG CLEAN_CMD= SHELL ["/bin/sh", "-lc"] -RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then xbps-install -Sy ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else xbps-remove -O || true; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1 || command -v qtpaths >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi +RUN set -eux; if [ -n "${UPDATE_CMD}" ]; then sh -lc "${UPDATE_CMD}"; fi; if [ -n "${CUSTOM_INSTALL}" ]; then sh -lc "${CUSTOM_INSTALL}"; elif [ -n "${PACKAGES}" ]; then xbps-install -Sy ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else xbps-remove -O || true; fi; if command -v qmake6 >/dev/null 2>&1 || command -v qmake-qt6 >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1; then true; else echo "Qt toolchain not found" >&2; exit 1; fi CMD ["/bin/sh"] |