summaryrefslogtreecommitdiff
path: root/images4docker/dockerfiles
diff options
context:
space:
mode:
Diffstat (limited to 'images4docker/dockerfiles')
-rw-r--r--images4docker/dockerfiles/amazonlinux-2023.Dockerfile2
-rw-r--r--images4docker/dockerfiles/centos-stream9.Dockerfile2
-rw-r--r--images4docker/dockerfiles/nix-latest.Dockerfile2
-rw-r--r--images4docker/dockerfiles/oraclelinux-9.Dockerfile2
-rw-r--r--images4docker/dockerfiles/rocky-9.Dockerfile2
-rw-r--r--images4docker/dockerfiles/void-latest.Dockerfile2
6 files changed, 6 insertions, 6 deletions
diff --git a/images4docker/dockerfiles/amazonlinux-2023.Dockerfile b/images4docker/dockerfiles/amazonlinux-2023.Dockerfile
index c20541ac43..817ff01103 100644
--- a/images4docker/dockerfiles/amazonlinux-2023.Dockerfile
+++ b/images4docker/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; dnf install -y qt6-qtbase-devel && dnf clean all; export PATH="$PATH:/usr/lib/qt6/bin:/usr/lib64/qt6/bin:/usr/libexec/qt6:/opt/qt6/bin:/root/.nix-profile/bin"; if command -v qmake6 >/dev/null 2>&1 || command -v qmake-qt6 >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1 || [ -x /usr/lib/qt6/bin/qmake ] || [ -x /usr/lib64/qt6/bin/qmake ] || [ -x /usr/lib/qt6/bin/qtpaths ] || [ -x /usr/lib64/qt6/bin/qtpaths ] || [ -x /usr/libexec/qt6/qmake ] || [ -x /usr/libexec/qt6/qtpaths ]; then true; else echo "Qt6 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; dnf install -y qt6-qtbase-devel && dnf clean all || echo "Qt6 not available on this base image (skipped)" >&2; export PATH="$PATH:/usr/lib/qt6/bin:/usr/lib64/qt6/bin:/usr/libexec/qt6:/opt/qt6/bin:/root/.nix-profile/bin"; if command -v qmake6 >/dev/null 2>&1 || command -v qmake-qt6 >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1 || [ -x /usr/lib/qt6/bin/qmake ] || [ -x /usr/lib64/qt6/bin/qmake ] || [ -x /usr/lib/qt6/bin/qtpaths ] || [ -x /usr/lib64/qt6/bin/qtpaths ] || [ -x /usr/libexec/qt6/qmake ] || [ -x /usr/libexec/qt6/qtpaths ]; then true; else echo "Qt6 not available on this base image (skipped)" >&2; fi
CMD ["/bin/sh"]
diff --git a/images4docker/dockerfiles/centos-stream9.Dockerfile b/images4docker/dockerfiles/centos-stream9.Dockerfile
index 902654a225..2e9a6df217 100644
--- a/images4docker/dockerfiles/centos-stream9.Dockerfile
+++ b/images4docker/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; dnf install -y qt6-qtbase-devel && dnf clean all; export PATH="$PATH:/usr/lib/qt6/bin:/usr/lib64/qt6/bin:/opt/qt6/bin:/root/.nix-profile/bin"; if command -v qmake6 >/dev/null 2>&1 || command -v qmake-qt6 >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1 || [ -x /usr/lib/qt6/bin/qmake ] || [ -x /usr/lib64/qt6/bin/qmake ] || [ -x /usr/lib/qt6/bin/qtpaths ] || [ -x /usr/lib64/qt6/bin/qtpaths ]; then true; else echo "Qt6 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; dnf install -y dnf-plugins-core && dnf config-manager --set-enabled crb && dnf install -y qt6-qtbase-devel && dnf clean all; export PATH="$PATH:/usr/lib/qt6/bin:/usr/lib64/qt6/bin:/opt/qt6/bin:/root/.nix-profile/bin"; if command -v qmake6 >/dev/null 2>&1 || command -v qmake-qt6 >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1 || [ -x /usr/lib/qt6/bin/qmake ] || [ -x /usr/lib64/qt6/bin/qmake ] || [ -x /usr/lib/qt6/bin/qtpaths ] || [ -x /usr/lib64/qt6/bin/qtpaths ]; then true; else echo "Qt6 toolchain not found" >&2; exit 1; fi
CMD ["/bin/sh"]
diff --git a/images4docker/dockerfiles/nix-latest.Dockerfile b/images4docker/dockerfiles/nix-latest.Dockerfile
index b1295ec4c9..2c46c13e66 100644
--- a/images4docker/dockerfiles/nix-latest.Dockerfile
+++ b/images4docker/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; nix-channel --update && nix-env -iA nixpkgs.qt6.qtbase; export PATH="$PATH:/usr/lib/qt6/bin:/usr/lib64/qt6/bin:/usr/libexec/qt6:/opt/qt6/bin:/root/.nix-profile/bin"; if command -v qmake6 >/dev/null 2>&1 || command -v qmake-qt6 >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1 || [ -x /usr/lib/qt6/bin/qmake ] || [ -x /usr/lib64/qt6/bin/qmake ] || [ -x /usr/lib/qt6/bin/qtpaths ] || [ -x /usr/lib64/qt6/bin/qtpaths ] || [ -x /usr/libexec/qt6/qmake ] || [ -x /usr/libexec/qt6/qtpaths ]; then true; else echo "Qt6 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 profile install ${PACKAGES}; fi; if [ -n "${CLEAN_CMD}" ]; then sh -lc "${CLEAN_CMD}"; else nix-collect-garbage -d || true; fi; nix profile install nixpkgs#qt6.qtbase; export PATH="$PATH:/usr/lib/qt6/bin:/usr/lib64/qt6/bin:/usr/libexec/qt6:/opt/qt6/bin:/root/.nix-profile/bin"; if command -v qmake6 >/dev/null 2>&1 || command -v qmake-qt6 >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1 || [ -x /usr/lib/qt6/bin/qmake ] || [ -x /usr/lib64/qt6/bin/qmake ] || [ -x /usr/lib/qt6/bin/qtpaths ] || [ -x /usr/lib64/qt6/bin/qtpaths ] || [ -x /usr/libexec/qt6/qmake ] || [ -x /usr/libexec/qt6/qtpaths ]; then true; else echo "Qt6 toolchain not found" >&2; exit 1; fi
CMD ["/bin/sh"]
diff --git a/images4docker/dockerfiles/oraclelinux-9.Dockerfile b/images4docker/dockerfiles/oraclelinux-9.Dockerfile
index 97a9dbeb69..31c527f28e 100644
--- a/images4docker/dockerfiles/oraclelinux-9.Dockerfile
+++ b/images4docker/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; dnf install -y qt6-qtbase-devel && dnf clean all; export PATH="$PATH:/usr/lib/qt6/bin:/usr/lib64/qt6/bin:/usr/libexec/qt6:/opt/qt6/bin:/root/.nix-profile/bin"; if command -v qmake6 >/dev/null 2>&1 || command -v qmake-qt6 >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1 || [ -x /usr/lib/qt6/bin/qmake ] || [ -x /usr/lib64/qt6/bin/qmake ] || [ -x /usr/lib/qt6/bin/qtpaths ] || [ -x /usr/lib64/qt6/bin/qtpaths ] || [ -x /usr/libexec/qt6/qmake ] || [ -x /usr/libexec/qt6/qtpaths ]; then true; else echo "Qt6 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; dnf install -y oracle-epel-release-el9 dnf-plugins-core && dnf config-manager --set-enabled ol9_codeready_builder && dnf install -y qt6-qtbase-devel && dnf clean all; export PATH="$PATH:/usr/lib/qt6/bin:/usr/lib64/qt6/bin:/usr/libexec/qt6:/opt/qt6/bin:/root/.nix-profile/bin"; if command -v qmake6 >/dev/null 2>&1 || command -v qmake-qt6 >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1 || [ -x /usr/lib/qt6/bin/qmake ] || [ -x /usr/lib64/qt6/bin/qmake ] || [ -x /usr/lib/qt6/bin/qtpaths ] || [ -x /usr/lib64/qt6/bin/qtpaths ] || [ -x /usr/libexec/qt6/qmake ] || [ -x /usr/libexec/qt6/qtpaths ]; then true; else echo "Qt6 toolchain not found" >&2; exit 1; fi
CMD ["/bin/sh"]
diff --git a/images4docker/dockerfiles/rocky-9.Dockerfile b/images4docker/dockerfiles/rocky-9.Dockerfile
index 0b80d7b1cd..31e613d7b1 100644
--- a/images4docker/dockerfiles/rocky-9.Dockerfile
+++ b/images4docker/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; (dnf config-manager --set-enabled crb 2>/dev/null || true) && dnf install -y qt6-qtbase-devel && dnf clean all; export PATH="$PATH:/usr/lib/qt6/bin:/usr/lib64/qt6/bin:/opt/qt6/bin:/root/.nix-profile/bin"; if command -v qmake6 >/dev/null 2>&1 || command -v qmake-qt6 >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1 || [ -x /usr/lib/qt6/bin/qmake ] || [ -x /usr/lib64/qt6/bin/qmake ] || [ -x /usr/lib/qt6/bin/qtpaths ] || [ -x /usr/lib64/qt6/bin/qtpaths ]; then true; else echo "Qt6 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; dnf install -y dnf-plugins-core epel-release && dnf config-manager --set-enabled crb && dnf install -y qt6-qtbase-devel && dnf clean all; export PATH="$PATH:/usr/lib/qt6/bin:/usr/lib64/qt6/bin:/opt/qt6/bin:/root/.nix-profile/bin"; if command -v qmake6 >/dev/null 2>&1 || command -v qmake-qt6 >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1 || [ -x /usr/lib/qt6/bin/qmake ] || [ -x /usr/lib64/qt6/bin/qmake ] || [ -x /usr/lib/qt6/bin/qtpaths ] || [ -x /usr/lib64/qt6/bin/qtpaths ]; then true; else echo "Qt6 toolchain not found" >&2; exit 1; fi
CMD ["/bin/sh"]
diff --git a/images4docker/dockerfiles/void-latest.Dockerfile b/images4docker/dockerfiles/void-latest.Dockerfile
index a8441221da..83fe5e922b 100644
--- a/images4docker/dockerfiles/void-latest.Dockerfile
+++ b/images4docker/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; xbps-install -Sy qt6-base-devel; export PATH="$PATH:/usr/lib/qt6/bin:/usr/lib64/qt6/bin:/usr/libexec/qt6:/opt/qt6/bin:/root/.nix-profile/bin"; if command -v qmake6 >/dev/null 2>&1 || command -v qmake-qt6 >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1 || [ -x /usr/lib/qt6/bin/qmake ] || [ -x /usr/lib64/qt6/bin/qmake ] || [ -x /usr/lib/qt6/bin/qtpaths ] || [ -x /usr/lib64/qt6/bin/qtpaths ] || [ -x /usr/libexec/qt6/qmake ] || [ -x /usr/libexec/qt6/qtpaths ]; then true; else echo "Qt6 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; xbps-install -S && xbps-install -y qt6-base-devel || echo "Qt6 not available on this base image (skipped)" >&2; export PATH="$PATH:/usr/lib/qt6/bin:/usr/lib64/qt6/bin:/usr/libexec/qt6:/opt/qt6/bin:/root/.nix-profile/bin"; if command -v qmake6 >/dev/null 2>&1 || command -v qmake-qt6 >/dev/null 2>&1 || command -v qtpaths6 >/dev/null 2>&1 || [ -x /usr/lib/qt6/bin/qmake ] || [ -x /usr/lib64/qt6/bin/qmake ] || [ -x /usr/lib/qt6/bin/qtpaths ] || [ -x /usr/lib64/qt6/bin/qtpaths ] || [ -x /usr/libexec/qt6/qmake ] || [ -x /usr/libexec/qt6/qtpaths ]; then true; else echo "Qt6 not available on this base image (skipped)" >&2; fi
CMD ["/bin/sh"]