Skip to content

Commit b1edec6

Browse files
authored
Merge branch 'master' into maintenance-03-2025
2 parents 46aca0c + 8a6b21b commit b1edec6

3 files changed

Lines changed: 13 additions & 3 deletions

File tree

CHANGELOG.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@
44

55
### Added
66

7-
- Add packages carvel/imgpkg and yg ([#1322](https://github.com/opendevstack/ods-core/issues/1322))
7+
- Add packages carvel/imgpkg and yq ([#1322](https://github.com/opendevstack/ods-core/issues/1322))
88
- Adde mask-passwords and office 365 connector plugins in Jenkins ([#1313](https://github.com/opendevstack/ods-core/issues/1313)) and ([#1316](https://github.com/opendevstack/ods-core/issues/1316))
9+
- Add package cosign ([#1323](https://github.com/opendevstack/ods-core/issues/1323))
910

1011
### Changed
12+
- Updated Aqua CLI ([#1325](https://github.com/opendevstack/ods-core/pull/1325))
1113

1214
### Fixed
1315

configuration-sample/ods-core.env.sample

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -250,8 +250,8 @@ JENKINS_AGENT_BASE_SNYK_DISTRIBUTION_URL=https://github.com/snyk/snyk/releases/d
250250
# Releases are published at https://download.aquasec.com/scanner
251251
# Check Aqua versions backward compatibility at https://docs.aquasec.com/docs/version-compatibility-of-components#section-backward-compatibility-across-two-major-versions
252252
# To Download the aquaSec scanner cli and check their documentaion requires a valid account on aquasec.com
253-
# Latest tested version is 2022.4.588
254-
# Example: https://<USER>:<PASSWORD>@download.aquasec.com/scanner/2022.4.588/scannercli
253+
# Latest tested version is 2022.4.720
254+
# Example: https://<USER>:<PASSWORD>@download.aquasec.com/scanner/2022.4.720/scannercli
255255
JENKINS_AGENT_BASE_AQUASEC_SCANNERCLI_URL=
256256

257257
# Repository of shared library

jenkins/agent-base/Dockerfile.ubi8

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
44

55
ENV SONAR_SCANNER_VERSION=7.0.2.4839 \
66
CNES_REPORT_VERSION=5.0.1 \
7+
COSIGN_VERSION=2.4.3 \
78
TAILOR_VERSION=1.3.4 \
89
SOPS_VERSION=3.9.4 \
910
HELM_VERSION=3.17.1 \
@@ -63,6 +64,13 @@ RUN cd /tmp \
6364
&& mv cnesreport.jar /usr/local/cnes/cnesreport.jar \
6465
&& chmod 777 /usr/local/cnes/cnesreport.jar
6566

67+
# Install sigstore/cosign
68+
RUN cd /tmp \
69+
&& curl -sSLO https://github.com/sigstore/cosign/releases/download/v${COSIGN_VERSION}/cosign-linux-amd64 \
70+
&& mv /tmp/cosign-linux-amd64 /usr/local/bin/cosign \
71+
&& chmod 755 /usr/local/bin/cosign \
72+
&& cosign version
73+
6674
# Install Tailor.
6775
RUN cd /tmp \
6876
&& curl -sSLO https://github.com/opendevstack/tailor/releases/download/v${TAILOR_VERSION}/tailor-linux-amd64 \

0 commit comments

Comments
 (0)