fix: handle too ca files (#57)

Author: eksrha

images/base/Dockerfile

@@ -32,7 +32,8 @@ RUN mkdir /helper-scripts \
   && mkdir -p $USER_TMP_DIR \
   && mkdir -p $RUNNER_HOME \
   && mkdir -p $HOME/.ansible \
-  && mkdir -p /run/user/$USERID
+  && mkdir -p /run/user/$USERID \
+  && mkdir -p /etc/ssl/certs/custom
 
 # Copy image helper scripts
 ADD ./helper-scripts/ /helper-scripts/

images/base/helper-scripts/detect-setup.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 
 CA_FILE="/etc/ssl/certs/ca-certificates.crt"
+CUSTOM_CA_FILE="/etc/ssl/certs/custom/ca-certificates.crt"
 
 importCertOldJava () {
     alias=$(openssl x509 -noout -subject -in "$1" | awk -F= '{print $NF}' | sed -e 's/^[ \t]*//' | sed -e 's/ /_/g')
@@ -14,6 +15,11 @@ importCertNewJava () {
     keytool -importcert -alias $alias -cacerts -storepass changeit -file $1 -noprompt -trustcacerts
 }
 
+# merge custom ca file
+if [ -f "$CA_FILE" ]; then
+    cat $CUSTOM_CA_FILE >> $CA_FILE
+fi
+
 # yarn
 if command -v yarn -v &> /dev/null; then
     echo ""