Explorar el Código

fix linebreaks in secrets

ahgraber hace 4 años
padre
commit
5abb9458c7
Se han modificado 2 ficheros con 3 adiciones y 2 borrados
  1. 1 1
      Dockerfile
  2. 2 1
      docker/rootfs/etc/cont-init.d/01_envfile.sh

+ 1 - 1
Dockerfile

@@ -1,4 +1,4 @@
-FROM jc21/alpine-nginx-full:node
+FROM --platform=${TARGETPLATFORM:-linux/amd64} jc21/alpine-nginx-full:node
 LABEL maintainer="Jamie Curnow <[email protected]>"
 
 ENV SUPPRESS_NO_CONFIG_WARNING=1

+ 2 - 1
docker/rootfs/etc/cont-init.d/01_envfile.sh

@@ -19,7 +19,8 @@ for FILENAME in $(find /var/run/s6/container_environment/ | grep "__FILE$"); do
         
         # ... and set value to contents of secretfile
         # since s6 uses text files, this is effectively "export ..."
-        cat $(${SECRETFILE} | xargs) > ${STRIPFILE}
+        # cat ${SECRETFILE} > ${STRIPFILE}
+        cat $(${SECRETFILE} | sed "s/[^\w.-]+//g") > ${STRIPFILE}
         echo "[secret-init] Set ${STRIPFILE} to $(cat ${STRIPFILE})"  # DEBUG - rm for prod!"
         echo "[secret-init] Success! ${STRIPFILE} set from ${FILENAME}"