custom ca, 6

custom ca, 5
custom ca, 4
2025-06-04 15:42:15 +02:00 · 2025-06-04 15:37:48 +02:00 · 2025-06-04 15:35:23 +02:00
2 changed files with 5 additions and 4 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -85,8 +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"
+                   --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/5
+++ b/5
@ -6,7 +6,7 @@ ENV DEFECTDOJO_URL=""
 ENV DEFECTDOJO_TOKEN=""

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

 RUN \
@ -14,7 +14,8 @@ RUN \
  adduser -s /bin/sh -D user &&\
  mkdir -p $APP_DIR &&\
  chown user:user $APP_DIR &&\
-  if [ "$ADDITIONAL_CA_URL" != "" -a "$ADDITIONAL_CA_CHECKSUM" != "" ]; then \
+  echo $ADDITIONAL_CA_URL &&\
+  if [ "$ADDITIONAL_CA_URL" != "x" ]; then \
    cd /usr/share/ca-certificates; \
    wget --no-check-certificate -O custom-ca.crt $ADDITIONAL_CA_URL; \
    echo "a921e440a742f1e67c7714306e2c0d76  custom-ca.crt" | md5sum -c; \
Author	SHA1	Message	Date
Wolfgang Hottgenroth	02aba34391	custom ca, 6 Some checks failed ci/woodpecker/tag/woodpecker Pipeline failed Details	2025-06-04 15:42:15 +02:00
Wolfgang Hottgenroth	1fb4c387a7	custom ca, 5 Some checks are pending ci/woodpecker/tag/woodpecker Pipeline is pending Details	2025-06-04 15:37:48 +02:00
Wolfgang Hottgenroth	92b61fdae0	custom ca, 4 Some checks are pending ci/woodpecker/tag/woodpecker Pipeline is pending Details	2025-06-04 15:35:23 +02:00