Merge pull request syslog-ng#5152 from kovgeri01/fix_dbld_outdated_apckages

kovgeri01 · web-flow · commit 2bec12192e18 · 2024-10-03T11:53:29.000+02:00
dbld: Update docker container before installing packages to avoid out…
diff --git 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
@@ -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
@@ -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-stream9.dockerfile b/dbld/images/centos-stream9.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
@@ -20,8 +21,6 @@ RUN /dbld/builddeps install_rpm_build_deps
 RUN /dbld/builddeps install_criterion
 RUN /dbld/builddeps install_gradle
 
-RUN dnf upgrade -y
-
 VOLUME /source
 VOLUME /build
 
diff --git 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
@@ -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
@@ -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
@@ -15,12 +15,11 @@ 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
 
-RUN apt upgrade -y
-
 VOLUME /source
 VOLUME /build
 
diff --git a/dbld/images/fedora-latest.dockerfile b/dbld/images/fedora-latest.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-rawhide.dockerfile b/dbld/images/fedora-rawhide.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
@@ -20,8 +21,6 @@ RUN /dbld/builddeps install_rpm_build_deps
 RUN /dbld/builddeps install_criterion
 RUN /dbld/builddeps install_gradle
 
-RUN dnf upgrade -y
-
 VOLUME /source
 VOLUME /build
 
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
