Skip to content

Commit 8faf992

Browse files
lucasaraglucasarag
authored
Merge branch 'master' into lbsfvt
2 parents 68893ea + dfb33b4 commit 8faf992

File tree

142 files changed

+434147
-464
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

142 files changed

+434147
-464
lines changed

‎.github/workflows/build-cli.yml‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,9 @@ jobs:
210210
# -------------------------------------------------------------------------------------------
211211
- name: Build the container image
212212
id: docker-build
213+
env:
214+
ARTIFACTORY_GENERIC_RELEASE_URL: ${{ secrets.ARTIFACTORY_GENERIC_RELEASE_URL }}
215+
ARTIFACTORY_TOKEN: ${{ secrets.ARTIFACTORY_TOKEN }}
213216
run: |
214217
echo "GITHUB_REF=$GITHUB_REF"
215218
echo "GITHUB_EVENT_NAME=$GITHUB_EVENT_NAME"
@@ -287,6 +290,9 @@ jobs:
287290
# -------------------------------------------------------------------------------------------
288291
- name: Build the container image
289292
id: docker-build
293+
env:
294+
ARTIFACTORY_GENERIC_RELEASE_URL: ${{ secrets.ARTIFACTORY_GENERIC_RELEASE_URL }}
295+
ARTIFACTORY_TOKEN: ${{ secrets.ARTIFACTORY_TOKEN }}
290296
run: |
291297
echo "GITHUB_REF=$GITHUB_REF"
292298
echo "GITHUB_EVENT_NAME=$GITHUB_EVENT_NAME"
@@ -295,7 +301,7 @@ jobs:
295301
docker login --username "${{ secrets.QUAYIO_USERNAME }}" --password "${{ secrets.QUAYIO_PASSWORD }}" quay.io
296302
297303
# Build the images
298-
$GITHUB_WORKSPACE/build/bin/docker-build.sh -r quay.io/ibmmas/cli --target-platform amd64 -b image/cli
304+
$GITHUB_WORKSPACE/build/bin/docker-build.sh -r quay.io/ibmmas/cli --target-platform amd64 -b image/cli --scap-data-stream ssg-rhel9-ds
299305
300306
# List available images
301307
docker images
@@ -363,6 +369,9 @@ jobs:
363369
# -------------------------------------------------------------------------------------------
364370
- name: Build the container image
365371
id: docker-build
372+
env:
373+
ARTIFACTORY_GENERIC_RELEASE_URL: ${{ secrets.ARTIFACTORY_GENERIC_RELEASE_URL }}
374+
ARTIFACTORY_TOKEN: ${{ secrets.ARTIFACTORY_TOKEN }}
366375
run: |
367376
echo "GITHUB_REF=$GITHUB_REF"
368377
echo "GITHUB_EVENT_NAME=$GITHUB_EVENT_NAME"
@@ -439,6 +448,9 @@ jobs:
439448
# -------------------------------------------------------------------------------------------
440449
- name: Build the container image
441450
id: docker-build
451+
env:
452+
ARTIFACTORY_GENERIC_RELEASE_URL: ${{ secrets.ARTIFACTORY_GENERIC_RELEASE_URL }}
453+
ARTIFACTORY_TOKEN: ${{ secrets.ARTIFACTORY_TOKEN }}
442454
run: |
443455
echo "GITHUB_REF=$GITHUB_REF"
444456
echo "GITHUB_EVENT_NAME=$GITHUB_EVENT_NAME"

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,3 +57,4 @@ python/README.rst
5757
/.venv
5858
/site
5959
report/
60+
/python/.venv

‎.pre-commit-config.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,4 @@ repos:
1414
hooks:
1515
- id: detect-secrets
1616
args: [--baseline, .secrets.baseline, --use-all-plugins, --fail-on-unaudited]
17+
additional_dependencies: [boxsdk<4]

‎.secrets.baseline‎

Lines changed: 30 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"exclude": {
3-
"files": "^.secrets.baseline$",
3+
"files": "build/bin/config/oscap/ssg-rhel9-ds.xml|^.secrets.baseline$",
44
"lines": null
55
},
66
"generated_at": "2025-11-03T13:30:26Z",
@@ -212,7 +212,7 @@
212212
"hashed_secret": "b2817467154949a61f8e9ad31d1eeaf03221cbfa",
213213
"is_secret": true,
214214
"is_verified": false,
215-
"line_number": 313,
215+
"line_number": 312,
216216
"type": "Secret Keyword",
217217
"verified_result": null
218218
}
@@ -222,7 +222,7 @@
222222
"hashed_secret": "b2817467154949a61f8e9ad31d1eeaf03221cbfa",
223223
"is_secret": true,
224224
"is_verified": false,
225-
"line_number": 338,
225+
"line_number": 337,
226226
"type": "Secret Keyword",
227227
"verified_result": null
228228
}
@@ -242,7 +242,7 @@
242242
"hashed_secret": "b2817467154949a61f8e9ad31d1eeaf03221cbfa",
243243
"is_secret": false,
244244
"is_verified": false,
245-
"line_number": 455,
245+
"line_number": 494,
246246
"type": "Secret Keyword",
247247
"verified_result": null
248248
}
@@ -252,7 +252,7 @@
252252
"hashed_secret": "2582aea6f911bd00fc04cb25e0ec16d5ead62068",
253253
"is_secret": false,
254254
"is_verified": false,
255-
"line_number": 154,
255+
"line_number": 153,
256256
"type": "Secret Keyword",
257257
"verified_result": null
258258
}
@@ -262,7 +262,7 @@
262262
"hashed_secret": "1459943ba5fd876f7ef6e48f566a40b448a2bf08",
263263
"is_secret": false,
264264
"is_verified": false,
265-
"line_number": 481,
265+
"line_number": 487,
266266
"type": "Secret Keyword",
267267
"verified_result": null
268268
}
@@ -292,7 +292,7 @@
292292
"hashed_secret": "2582aea6f911bd00fc04cb25e0ec16d5ead62068",
293293
"is_secret": false,
294294
"is_verified": false,
295-
"line_number": 178,
295+
"line_number": 177,
296296
"type": "Secret Keyword",
297297
"verified_result": null
298298
}
@@ -312,7 +312,7 @@
312312
"hashed_secret": "2582aea6f911bd00fc04cb25e0ec16d5ead62068",
313313
"is_secret": false,
314314
"is_verified": false,
315-
"line_number": 233,
315+
"line_number": 232,
316316
"type": "Secret Keyword",
317317
"verified_result": null
318318
}
@@ -362,15 +362,15 @@
362362
"hashed_secret": "effb7852555adce89885fb075fb43a77a1e0e77e",
363363
"is_secret": false,
364364
"is_verified": false,
365-
"line_number": 276,
365+
"line_number": 275,
366366
"type": "Secret Keyword",
367367
"verified_result": null
368368
},
369369
{
370370
"hashed_secret": "2582aea6f911bd00fc04cb25e0ec16d5ead62068",
371371
"is_secret": false,
372372
"is_verified": false,
373-
"line_number": 283,
373+
"line_number": 282,
374374
"type": "Secret Keyword",
375375
"verified_result": null
376376
}
@@ -390,23 +390,23 @@
390390
"hashed_secret": "b2817467154949a61f8e9ad31d1eeaf03221cbfa",
391391
"is_secret": false,
392392
"is_verified": false,
393-
"line_number": 636,
393+
"line_number": 643,
394394
"type": "Secret Keyword",
395395
"verified_result": null
396396
},
397397
{
398398
"hashed_secret": "effb7852555adce89885fb075fb43a77a1e0e77e",
399399
"is_secret": false,
400400
"is_verified": false,
401-
"line_number": 805,
401+
"line_number": 823,
402402
"type": "Secret Keyword",
403403
"verified_result": null
404404
},
405405
{
406406
"hashed_secret": "2582aea6f911bd00fc04cb25e0ec16d5ead62068",
407407
"is_secret": false,
408408
"is_verified": false,
409-
"line_number": 807,
409+
"line_number": 825,
410410
"type": "Secret Keyword",
411411
"verified_result": null
412412
}
@@ -444,7 +444,7 @@
444444
"hashed_secret": "b2817467154949a61f8e9ad31d1eeaf03221cbfa",
445445
"is_secret": false,
446446
"is_verified": false,
447-
"line_number": 540,
447+
"line_number": 545,
448448
"type": "Secret Keyword",
449449
"verified_result": null
450450
}
@@ -474,15 +474,15 @@
474474
"hashed_secret": "b2817467154949a61f8e9ad31d1eeaf03221cbfa",
475475
"is_secret": false,
476476
"is_verified": false,
477-
"line_number": 238,
477+
"line_number": 243,
478478
"type": "Secret Keyword",
479479
"verified_result": null
480480
},
481481
{
482482
"hashed_secret": "fb3c6e4de85bd9eae26fdc63e75f10a7f39e850e",
483483
"is_secret": false,
484484
"is_verified": false,
485-
"line_number": 348,
485+
"line_number": 356,
486486
"type": "Secret Keyword",
487487
"verified_result": null
488488
}
@@ -492,7 +492,7 @@
492492
"hashed_secret": "effb7852555adce89885fb075fb43a77a1e0e77e",
493493
"is_secret": false,
494494
"is_verified": false,
495-
"line_number": 725,
495+
"line_number": 728,
496496
"type": "Secret Keyword",
497497
"verified_result": null
498498
}
@@ -502,7 +502,7 @@
502502
"hashed_secret": "2582aea6f911bd00fc04cb25e0ec16d5ead62068",
503503
"is_secret": false,
504504
"is_verified": false,
505-
"line_number": 336,
505+
"line_number": 346,
506506
"type": "Secret Keyword",
507507
"verified_result": null
508508
}
@@ -512,7 +512,7 @@
512512
"hashed_secret": "e62334bcf07206e5aacba407fb29c1b85540d61f",
513513
"is_secret": false,
514514
"is_verified": false,
515-
"line_number": 215,
515+
"line_number": 219,
516516
"type": "Secret Keyword",
517517
"verified_result": null
518518
}
@@ -567,6 +567,16 @@
567567
"verified_result": null
568568
}
569569
],
570+
"image/cli/mascli/templates/gitops/appset-configs/cluster/image-mirroring.yaml.j2": [
571+
{
572+
"hashed_secret": "fee2d55ad9a49a95fc89abe8f414dad66704ebfd",
573+
"is_secret": false,
574+
"is_verified": false,
575+
"line_number": 7,
576+
"type": "Secret Keyword",
577+
"verified_result": null
578+
}
579+
],
570580
"image/cli/mascli/templates/gitops/appset-configs/cluster/instance/configs/ibm-mas-jdbc-config.yaml.j2": [
571581
{
572582
"hashed_secret": "146abac680841f15b3e7b5259e1dfcdd9de49fdd",
@@ -760,7 +770,7 @@
760770
"hashed_secret": "d2e2ab0f407e4ee3cf2ab87d61c31b25a74085e5",
761771
"is_secret": false,
762772
"is_verified": false,
763-
"line_number": 27,
773+
"line_number": 32,
764774
"type": "Secret Keyword",
765775
"verified_result": null
766776
}

‎build/bin/.env.sh‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@
66
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
77
export PATH=$PATH:$DIR:$DIR/ptc
88

9+
CONFIG_DIR=$DIR/config
10+
# Use OSCAP tools to produce image hardening report for built images
11+
export OSCAP_ENABLED=${OSCAP_ENABLED:-true}
12+
export OSCAP_DIR=$GITHUB_WORKSPACE/.oscap
13+
914
# Version file (semver)
1015
export VERSION_FILE=${GITHUB_WORKSPACE}/.version
1116
if [ -f "$VERSION_FILE" ]; then

‎build/bin/.functions.sh‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,3 +93,8 @@ function artifactory_upload() {
9393
echo "Uploading $1 to $2"
9494
curl -H "Authorization:Bearer $ARTIFACTORY_TOKEN" -H "X-Checksum-Md5: $md5Value" -H "X-Checksum-Sha1: $sha1Value" -T $1 $2 || exit 1
9595
}
96+
97+
# install oscap tools
98+
function install_oscap() {
99+
sudo apt-get install -y openscap-scanner
100+
}

0 commit comments

Comments
 (0)