From 7c687a7505460bfd5e481a0935c2c8bd94c82931 Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Mon, 12 Feb 2024 16:51:32 -0800 Subject: [PATCH 1/2] Add libpq-devel to UBI image The Debian images add `libpq-dev` to support the `pg` gem, so we need this in UBI as well. This came out of https://gitlab.com/gitlab-org/gitlab/-/merge_requests/144500. --- scripts/install-essentials | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install-essentials b/scripts/install-essentials index cef1724..99d9cd4 100755 --- a/scripts/install-essentials +++ b/scripts/install-essentials @@ -65,7 +65,7 @@ function prepare_ubi_environment() { yum install -by --nodocs \ autoconf clang-devel cmake gcc gcc-c++ make patch perl bzip2 \ libedit ncurses uuid libarchive curl-devel \ - libicu-devel libyaml-devel libedit-devel libffi-devel libuuid-devel openssl-devel \ + libicu-devel libyaml-devel libedit-devel libffi-devel libpq-devel libuuid-devel openssl-devel \ ncurses-devel pcre2-devel zlib-devel libstdc++-static \ libevent-devel redhat-lsb-core procps-ng From 2678e26b22cd2edbc6224864b3344e5f2e3c3c59 Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Mon, 12 Feb 2024 18:07:22 -0800 Subject: [PATCH 2/2] Make GitLab and Gitaly builds dependent on install-essentials This is the base script that is used to install dependencies, so we should generate images if this is changed. --- .gitlab/ci/gitaly.images.yml | 1 + .gitlab/ci/gitlab.images.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.gitlab/ci/gitaly.images.yml b/.gitlab/ci/gitaly.images.yml index 6a10d7d..18fd615 100644 --- a/.gitlab/ci/gitaly.images.yml +++ b/.gitlab/ci/gitaly.images.yml @@ -6,6 +6,7 @@ - !reference [.build_dynamic_image, rules] - changes: - "scripts/lib/custom-docker-build" + - "scripts/install-essentials" - "scripts/install-git" - "scripts/install-golang" - ".gitlab/ci/gitaly.images.yml" diff --git a/.gitlab/ci/gitlab.images.yml b/.gitlab/ci/gitlab.images.yml index c24f0f3..1d7f83b 100644 --- a/.gitlab/ci/gitlab.images.yml +++ b/.gitlab/ci/gitlab.images.yml @@ -9,6 +9,7 @@ - "scripts/install-bazelisk" - "scripts/install-chrome" - "scripts/install-docker" + - "scripts/install-essentials" - "scripts/install-exiftool" - "scripts/install-git" - "scripts/install-gcloud"