Merge pull request aerokube#15 from vania-pooh/master

More compact commands for applying certificate
vania-pooh · Apr 4, 2021 · 7270f40 · 7270f40
2 parents 4557892 + c5e091e
commit 7270f40
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -53,10 +53,7 @@ RUN \
     apt-get clean && \
     rm -Rf /tmp/* && rm -Rf /var/lib/apt/lists/* && \
     chmod 777 /etc/ssl/certs && \
-    rm -Rf /usr/local/share/ca-certificates && \
-    mkdir /tmp/ca-certificates && \
-    chmod 777 /tmp/ca-certificates && \
-    ln -s /tmp/ca-certificates /usr/local/share/ca-certificates
+    mkdir /tmp/ca-certificates
 
 COPY entrypoint.sh /
 

diff --git a/entrypoint.sh b/entrypoint.sh
@@ -41,9 +41,9 @@ XSELD_PID=$!
 if env | grep -q ROOT_CA_; then
   for e in $(env | grep ROOT_CA_ | sed -e 's/=.*$//'); do
     certname=$(echo -n $e | sed -e 's/ROOT_CA_//')
-    echo ${!e} | base64 -d >/usr/local/share/ca-certificates/${certname}.pem
+    echo ${!e} | base64 -d >/usr/local/share/ca-certificates/${certname}.crt
   done
-  update-ca-certificates
+  update-ca-certificates --localcertsdir /tmp/ca-certificates
 fi
 
 /usr/bin/xvfb-run -l -n "$DISPLAY_NUM" -s "-ac -screen 0 $SCREEN_RESOLUTION -noreset -listen tcp" /usr/bin/fluxbox -display "$DISPLAY" >/dev/null 2>&1 &