Merge branch 'master' into alma

startxfr · Dec 20, 2021 · c12bc5c · c12bc5c
2 parents b0bf0d1 + c55af8f
commit c12bc5c
Show file tree

Hide file tree

Showing 8 changed files with 363 additions and 5 deletions.
diff --git a/.gitlab/ci/step-test.yaml b/.gitlab/ci/step-test.yaml
@@ -6,7 +6,7 @@ include:
   - template: Security/Dependency-Scanning.gitlab-ci.yml
   - template: Security/License-Scanning.gitlab-ci.yml
   - template: Security/SAST.gitlab-ci.yml
-  - template: Security/Secret-Detection.gitlab-ci.yml
+  # - template: Security/Secret-Detection.gitlab-ci.yml
   - template: DAST.gitlab-ci.yml
 
 
@@ -18,8 +18,8 @@ sast:
   stage: test
   variables:
     VALIDATE_SCHEMA: "true"
-.secret-analyzer:
-  stage: test
+# .secret-analyzer:
+#   stage: test
 
 
 # Your selected site and scanner profiles:

diff --git a/.gitlab/img/os-alma.svg b/.gitlab/img/os-alma.svg
diff --git a/.gitlab/img/os-alpine.svg b/.gitlab/img/os-alpine.svg
diff --git a/.gitlab/img/os-centos.svg b/.gitlab/img/os-centos.svg
diff --git a/.gitlab/img/os-fedora.svg b/.gitlab/img/os-fedora.svg
diff --git a/.gitlab/img/os-rocky.svg b/.gitlab/img/os-rocky.svg
diff --git a/.gitlab/img/os-ubi.svg b/.gitlab/img/os-ubi.svg
diff --git a/docs/index.md b/docs/index.md
@@ -101,8 +101,8 @@ your project and start using stable or experimental services in your application
 - `fc28` based on fedora core 28 [see detail](https://docker-images.readthedocs.io/en/fc28)
 - `fc27` based on fedora core 27 [see detail](https://docker-images.readthedocs.io/en/fc27)
 - `fc26` based on fedora core 26 [see detail](https://docker-images.readthedocs.io/en/fc26)
-- `alma8` based on Alma Linux 8 [see detail](https://docker-images.readthedocs.io/en/alma8)
-- `rocky8` based on Rocky Linux 8 [see detail](https://docker-images.readthedocs.io/en/rocky8)
+- `alma8` based on Alma Linux 8 [see detail](https://docker-images.readthedocs.io/en/alma)
+- `rocky8` based on Rocky Linux 8 [see detail](https://docker-images.readthedocs.io/en/rocky)
 - `centos8` based on Centos 8 [see detail](https://docker-images.readthedocs.io/en/centos8)
 - `centos7` based on Centos 7 [see detail](https://docker-images.readthedocs.io/en/centos7)
 - `centos6` based on Centos 6 [see detail](https://docker-images.readthedocs.io/en/centos6)