custom ca, 3

custom ca, 2
custom ca
2025-06-04 15:33:14 +02:00 · 2025-06-04 15:31:14 +02:00 · 2025-06-04 15:24:15 +02:00
2 changed files with 18 additions and 4 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -7,7 +7,8 @@ variables:
  IMAGE_NAME: $REGISTRY/$CI_PROJECT_NAME
  DTRACK_API_URL: https://dtrack-api-rd.krohne.com
  DEFECTDOJO_API_URL: https://defectdojo-rd.krohne.com
-
+  KROHNE_CA_URL: https://devwiki.krohnegroup.com/lib/exe/fetch.php?media=krohne-ca.crt
+  KROHNE_CA_CHECKSUM: a921e440a742f1e67c7714306e2c0d76

 .generate-api:
  stage: generate-api-clients
@ -20,8 +21,8 @@ variables:
    - if: '$CI_COMMIT_BRANCH == "main"'
    - if: '$CI_COMMIT_TAG'
  before_script:
-    - curl --insecure https://devwiki.krohnegroup.com/lib/exe/fetch.php?media=krohne-ca.crt -o krohne-ca.crt
-    - echo "a921e440a742f1e67c7714306e2c0d76  krohne-ca.crt" | md5sum -c 
+    - curl --insecure $KROHNE_CA_URL -o krohne-ca.crt
+    - echo "$KROHNE_CA_CHECKSUM  krohne-ca.crt" | md5sum -c 
    - mv krohne-ca.crt /usr/local/share/ca-certificates
    - update-ca-certificates

@ -84,6 +85,8 @@ dockerize:
    - docker build --tag $IMAGE_NAME:latest 
                   --tag $IMAGE_NAME:$CI_COMMIT_SHA
                   --tag $IMAGE_NAME:$CI_COMMIT_TAG
+                   --build-arg "CUSTOM_CA_URL=$KROHNE_CA_URL"
+                   --build-arg "CUSTOM_CA_CHECKSUM=$KROHNE_CA_CHECKSUM"
                   .
    - docker login -u $NEXUS_USER -p $NEXUS_PASSWORD $REGISTRY
    - docker push $IMAGE_NAME:latest
--- a/13
+++ b/13
@ -6,12 +6,23 @@ ENV DEFECTDOJO_URL=""
 ENV DEFECTDOJO_TOKEN=""

 ARG APP_DIR=/opt/app
+ARG ADDITIONAL_CA_URL=""
+ARG ADDITIONAL_CA_CHECKSUM=""

 RUN \
  apk add --no-cache syft &&\
  adduser -s /bin/sh -D user &&\
  mkdir -p $APP_DIR &&\
-  chown user:user $APP_DIR
+  chown user:user $APP_DIR &&\
+  if [ "$ADDITIONAL_CA_URL" != "" -a "$ADDITIONAL_CA_CHECKSUM" != "" ]; then \
+    cd /usr/share/ca-certificates; \
+    wget --no-check-certificate -O custom-ca.crt $ADDITIONAL_CA_URL; \
+    echo "a921e440a742f1e67c7714306e2c0d76  custom-ca.crt" | md5sum -c; \
+    /usr/sbin/update-ca-certificates; \
+    echo "custom ca added"; \
+  else \
+    echo "no additional ca"; \
+  fi 

 USER user
 WORKDIR $APP_DIR
Author	SHA1	Message	Date
Wolfgang Hottgenroth	4ddb6cfd30	custom ca, 3 Some checks are pending ci/woodpecker/tag/woodpecker Pipeline is pending Details	2025-06-04 15:33:14 +02:00
Wolfgang Hottgenroth	0eb761db27	custom ca, 2 Some checks are pending ci/woodpecker/tag/woodpecker Pipeline is pending Details	2025-06-04 15:31:14 +02:00
Wolfgang Hottgenroth	9cc81373dc	custom ca Some checks are pending ci/woodpecker/tag/woodpecker Pipeline is pending Details	2025-06-04 15:24:15 +02:00