From 3db2159fc4661848b5a5c1fae8a17d13abb33697 Mon Sep 17 00:00:00 2001 From: Jordan Petridis Date: Thu, 24 Aug 2023 13:52:29 +0300 Subject: [PATCH] ci: Add ca-certificates to the indent image This is needed to rebuild the image Part-of: --- .gitlab-ci.yml | 2 +- .gitlab-image-tags.yml | 2 +- ci/docker/indent/prepare.sh | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4cdf4c5be1..94873a0d0f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -136,7 +136,7 @@ fedora amd64 docker: FDO_DISTRIBUTION_VERSION: 'bookworm' FDO_REPO_SUFFIX: "$INDENT_AMD64_SUFFIX" FDO_DISTRIBUTION_TAG: "$INDENT_TAG-$GST_UPSTREAM_BRANCH" - FDO_DISTRIBUTION_PACKAGES: 'curl indent git findutils' + FDO_DISTRIBUTION_PACKAGES: 'curl indent git findutils ca-certificates' FDO_DISTRIBUTION_EXEC: 'ci/docker/indent/prepare.sh' gst-indent amd64 docker: diff --git a/.gitlab-image-tags.yml b/.gitlab-image-tags.yml index ff4086e401..fc6f28277f 100644 --- a/.gitlab-image-tags.yml +++ b/.gitlab-image-tags.yml @@ -7,7 +7,7 @@ variables: ### FEDORA_TAG: '2023-08-25.1' - INDENT_TAG: '2023-06-14.1' + INDENT_TAG: '2023-08-24.3' LINT_TAG: '2023-02-16.5' diff --git a/ci/docker/indent/prepare.sh b/ci/docker/indent/prepare.sh index 1366702823..a2849d355b 100755 --- a/ci/docker/indent/prepare.sh +++ b/ci/docker/indent/prepare.sh @@ -1,3 +1,5 @@ +#! /bin/bash + set -e set -x # Install dotnet-format