Perform env-var replacements at runtime.

aminvakil · Jun 10, 2024 · ed9001d · ed9001d
1 parent 545af29
commit ed9001d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -68,9 +68,7 @@ RUN set -x \
 	    -e '/\[vhost:www.example.com\]/,$d' \
 	    -e '/^cookie-timeout = /{s/300/3600/}' \
 	    -e 's/^isolate-workers/#isolate-workers/' /etc/ocserv/ocserv.conf > /tmp/ocserv.conf \
-	&& cat /tmp/routes.txt >> /tmp/ocserv.conf \
-	&& envsubst < /tmp/ocserv.conf > /etc/ocserv/ocserv.conf \
-	&& rm -f /tmp/ocserv.conf
+	&& cat /tmp/routes.txt >> /tmp/ocserv.conf
 
 WORKDIR /etc/ocserv
 

diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
@@ -71,5 +71,8 @@ mkdir -p /dev/net
 mknod /dev/net/tun c 10 200
 chmod 600 /dev/net/tun
 
+# Update config
+envsubst < /tmp/ocserv.conf > /etc/ocserv/ocserv.conf
+
 # Run OpennConnect Server
 exec "$@"