diff --git a/dbld/builddeps b/dbld/builddeps index ef7f79e0f..639b08f17 100755 --- a/dbld/builddeps +++ b/dbld/builddeps @@ -10,6 +10,21 @@ APT_INSTALL="apt-get install -y --no-install-recommends" set -e set -x +function update_packages() { + case "${OS_DISTRIBUTION}" in + centos|almalinux) + yum update -y + ;; + debian|ubuntu) + apt-get update + apt-get upgrade -y + ;; + fedora) + dnf upgrade -y + ;; + esac +} + function workaround_rpm_repos() { MIRROR_URL='https://ftp.halifax.rwth-aachen.de/fedora/linux' case "${OS_DISTRIBUTION}" in diff --git a/dbld/images/almalinux-8.dockerfile b/dbld/images/almalinux-8.dockerfile index 979ae88b8..396ffe811 100644 --- a/dbld/images/almalinux-8.dockerfile +++ b/dbld/images/almalinux-8.dockerfile @@ -11,6 +11,7 @@ LABEL COMMIT=${COMMIT} COPY images/entrypoint.sh / COPY . /dbld/ +RUN /dbld/builddeps update_packages RUN /dbld/builddeps install_dbld_dependencies RUN /dbld/builddeps add_epel_repo RUN /dbld/builddeps add_copr_repo diff --git a/dbld/images/almalinux-9.dockerfile b/dbld/images/almalinux-9.dockerfile index dd8cc8d08..14e6ae601 100644 --- a/dbld/images/almalinux-9.dockerfile +++ b/dbld/images/almalinux-9.dockerfile @@ -11,6 +11,7 @@ LABEL COMMIT=${COMMIT} COPY images/entrypoint.sh / COPY . /dbld/ +RUN /dbld/builddeps update_packages RUN /dbld/builddeps install_dbld_dependencies RUN /dbld/builddeps add_epel_repo RUN /dbld/builddeps add_copr_repo diff --git a/dbld/images/centos-7.dockerfile b/dbld/images/centos-7.dockerfile index 1ff2f931e..eb98cbd1c 100644 --- a/dbld/images/centos-7.dockerfile +++ b/dbld/images/centos-7.dockerfile @@ -11,6 +11,7 @@ LABEL COMMIT=${COMMIT} COPY images/entrypoint.sh / COPY . /dbld/ +RUN /dbld/builddeps update_packages RUN /dbld/builddeps install_dbld_dependencies RUN /dbld/builddeps add_epel_repo RUN /dbld/builddeps add_copr_repo diff --git a/dbld/images/debian-bookworm.dockerfile b/dbld/images/debian-bookworm.dockerfile index d3d7d8521..027147240 100644 --- a/dbld/images/debian-bookworm.dockerfile +++ b/dbld/images/debian-bookworm.dockerfile @@ -15,6 +15,7 @@ ENV LANG C.UTF-8 COPY images/entrypoint.sh / COPY . /dbld/ +RUN /dbld/builddeps update_packages RUN /dbld/builddeps install_dbld_dependencies RUN /dbld/builddeps install_apt_packages RUN /dbld/builddeps install_debian_build_deps diff --git a/dbld/images/debian-bullseye.dockerfile b/dbld/images/debian-bullseye.dockerfile index d82c616df..bdd929910 100644 --- a/dbld/images/debian-bullseye.dockerfile +++ b/dbld/images/debian-bullseye.dockerfile @@ -15,6 +15,7 @@ ENV LANG C.UTF-8 COPY images/entrypoint.sh / COPY . /dbld/ +RUN /dbld/builddeps update_packages RUN /dbld/builddeps install_dbld_dependencies RUN /dbld/builddeps install_apt_packages RUN /dbld/builddeps install_debian_build_deps diff --git a/dbld/images/debian-sid.dockerfile b/dbld/images/debian-sid.dockerfile index 13c75552d..374cbc50f 100644 --- a/dbld/images/debian-sid.dockerfile +++ b/dbld/images/debian-sid.dockerfile @@ -15,6 +15,7 @@ ENV LANG C.UTF-8 COPY images/entrypoint.sh / COPY . /dbld/ +RUN /dbld/builddeps update_packages RUN /dbld/builddeps install_dbld_dependencies RUN /dbld/builddeps install_apt_packages RUN /dbld/builddeps install_debian_build_deps diff --git a/dbld/images/debian-testing.dockerfile b/dbld/images/debian-testing.dockerfile index 73e5cf741..bb99d4587 100644 --- a/dbld/images/debian-testing.dockerfile +++ b/dbld/images/debian-testing.dockerfile @@ -15,6 +15,7 @@ ENV LANG C.UTF-8 COPY images/entrypoint.sh / COPY . /dbld/ +RUN /dbld/builddeps update_packages RUN /dbld/builddeps install_dbld_dependencies RUN /dbld/builddeps install_apt_packages RUN /dbld/builddeps install_debian_build_deps diff --git a/dbld/images/fedora-39.dockerfile b/dbld/images/fedora-39.dockerfile index 16342994b..54454d99d 100644 --- a/dbld/images/fedora-39.dockerfile +++ b/dbld/images/fedora-39.dockerfile @@ -11,6 +11,7 @@ LABEL COMMIT=${COMMIT} COPY images/entrypoint.sh / COPY . /dbld/ +RUN /dbld/builddeps update_packages RUN /dbld/builddeps workaround_rpm_repos RUN /dbld/builddeps install_dbld_dependencies RUN /dbld/builddeps add_copr_repo diff --git a/dbld/images/fedora-40.dockerfile b/dbld/images/fedora-40.dockerfile index bb5623cac..3e28899c9 100644 --- a/dbld/images/fedora-40.dockerfile +++ b/dbld/images/fedora-40.dockerfile @@ -11,6 +11,7 @@ LABEL COMMIT=${COMMIT} COPY images/entrypoint.sh / COPY . /dbld/ +RUN /dbld/builddeps update_packages RUN /dbld/builddeps workaround_rpm_repos RUN /dbld/builddeps install_dbld_dependencies RUN /dbld/builddeps add_copr_repo diff --git a/dbld/images/ubuntu-focal.dockerfile b/dbld/images/ubuntu-focal.dockerfile index 611d52801..cf1901cbd 100644 --- a/dbld/images/ubuntu-focal.dockerfile +++ b/dbld/images/ubuntu-focal.dockerfile @@ -15,6 +15,7 @@ ENV LANG C.UTF-8 COPY images/entrypoint.sh / COPY . /dbld/ +RUN /dbld/builddeps update_packages RUN /dbld/builddeps install_dbld_dependencies RUN /dbld/builddeps install_apt_packages RUN /dbld/builddeps install_debian_build_deps diff --git a/dbld/images/ubuntu-jammy.dockerfile b/dbld/images/ubuntu-jammy.dockerfile index fdcffd3d2..ff893132e 100644 --- a/dbld/images/ubuntu-jammy.dockerfile +++ b/dbld/images/ubuntu-jammy.dockerfile @@ -15,6 +15,7 @@ ENV LANG C.UTF-8 COPY images/entrypoint.sh / COPY . /dbld/ +RUN /dbld/builddeps update_packages RUN /dbld/builddeps install_dbld_dependencies RUN /dbld/builddeps install_apt_packages RUN /dbld/builddeps install_debian_build_deps diff --git a/dbld/images/ubuntu-lunar.dockerfile b/dbld/images/ubuntu-lunar.dockerfile index d5ccd716b..a729d21b0 100644 --- a/dbld/images/ubuntu-lunar.dockerfile +++ b/dbld/images/ubuntu-lunar.dockerfile @@ -15,6 +15,7 @@ ENV LANG C.UTF-8 COPY images/entrypoint.sh / COPY . /dbld/ +RUN /dbld/builddeps update_packages RUN /dbld/builddeps install_dbld_dependencies RUN /dbld/builddeps install_apt_packages RUN /dbld/builddeps install_debian_build_deps diff --git a/dbld/images/ubuntu-mantic.dockerfile b/dbld/images/ubuntu-mantic.dockerfile index 74b0abd23..9f2325381 100644 --- a/dbld/images/ubuntu-mantic.dockerfile +++ b/dbld/images/ubuntu-mantic.dockerfile @@ -15,6 +15,7 @@ ENV LANG C.UTF-8 COPY images/entrypoint.sh / COPY . /dbld/ +RUN /dbld/builddeps update_packages RUN /dbld/builddeps install_dbld_dependencies RUN /dbld/builddeps install_apt_packages RUN /dbld/builddeps install_debian_build_deps diff --git a/dbld/images/ubuntu-noble.dockerfile b/dbld/images/ubuntu-noble.dockerfile index 27e6b2791..a8631d85d 100644 --- a/dbld/images/ubuntu-noble.dockerfile +++ b/dbld/images/ubuntu-noble.dockerfile @@ -15,6 +15,7 @@ ENV LANG C.UTF-8 COPY images/entrypoint.sh / COPY . /dbld/ +RUN /dbld/builddeps update_packages RUN /dbld/builddeps install_dbld_dependencies RUN /dbld/builddeps install_apt_packages RUN /dbld/builddeps install_debian_build_deps