feat: Loading environment variable values from file (#17)

homecentr · May 15, 2020 · 8bc1ceb · 8bc1ceb
1 parent 2a3e3f3
commit 8bc1ceb
Show file tree

Hide file tree

Showing 11 changed files with 58 additions and 19 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,4 +1,5 @@
 * text=auto
 *.sh eol=lf
 **/run eol=lf
-*/services.d/* eol=lf
+*/services.d/* eol=lf
+**/run eol=lf
diff --git a/alpine/docker-compose.yml b/alpine/docker-compose.yml
@@ -0,0 +1,10 @@
+version: "3.7"
+services:
+ base_centos:
+ build: .
+ image: homecentr/base:alpine-local
+ environment:
+ FILE__TEST_VAR: "/var-value.txt"
+ volumes:
+ - "./example/run:/etc/services.d/env-test/run"
+ - "./example/var-value.txt:/var-value.txt"
diff --git a/alpine/example/Dockerfile b/alpine/example/Dockerfile
diff --git a/alpine/example/run b/alpine/example/run
@@ -0,0 +1,3 @@
+#!/usr/bin/with-contenv ash
+
+exec echo "TEST_VAR=$TEST_VAR"
diff --git a/alpine/example/var-value.txt b/alpine/example/var-value.txt
@@ -0,0 +1 @@
+Hello, world!
diff --git a/alpine/fs/etc/cont-init.d/01-env.sh b/alpine/fs/etc/cont-init.d/01-env.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/with-contenv ash
+
+for FILENAME in /var/run/s6/container_environment/FILE__*; do
+ VAR_VALUE_FILE=$(cat ${FILENAME})
+ VAR_NAME="${FILENAME#'/var/run/s6/container_environment/FILE__'}"
+
+ if [ -f "$VAR_VALUE_FILE" ]; then
+ cat "$VAR_VALUE_FILE" > "/var/run/s6/container_environment/${VAR_NAME}"
+ echo "[env-vars] Variable $VAR_NAME set from ${VAR_VALUE_FILE}"
+ else
+ echo "[env-vars] Variable $VAR_NAME could not be set from ${VAR_VALUE_FILE}. File not found."
+ fi 
+
+done
diff --git a/centos/docker-compose.yml b/centos/docker-compose.yml
@@ -0,0 +1,10 @@
+version: "3.7"
+services:
+ base_centos:
+ build: .
+ image: homecentr/base:centos-local
+ environment:
+ FILE__TEST_VAR: "/var-value.txt"
+ volumes:
+ - "./example/run:/etc/services.d/env-test/run"
+ - "./example/var-value.txt:/var-value.txt"
diff --git a/centos/example/Dockerfile b/centos/example/Dockerfile
diff --git a/centos/example/run b/centos/example/run
@@ -0,0 +1,3 @@
+#!/usr/bin/with-contenv bash
+
+exec echo "TEST_VAR=$TEST_VAR"
diff --git a/centos/example/var-value.txt b/centos/example/var-value.txt
@@ -0,0 +1 @@
+Hello, world!
diff --git a/centos/fs/etc/cont-init.d/01-env.sh b/centos/fs/etc/cont-init.d/01-env.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/with-contenv bash
+
+for FILENAME in /var/run/s6/container_environment/FILE__*; do
+ VAR_VALUE_FILE=$(cat ${FILENAME})
+ VAR_NAME="${FILENAME#'/var/run/s6/container_environment/FILE__'}"
+
+ if [ -f "$VAR_VALUE_FILE" ]; then
+ cat "$VAR_VALUE_FILE" > "/var/run/s6/container_environment/${VAR_NAME}"
+ echo "[env-vars] Variable $VAR_NAME set from ${VAR_VALUE_FILE}"
+ else
+ echo "[env-vars] Variable $VAR_NAME could not be set from ${VAR_VALUE_FILE}. File not found."
+ fi 
+
+done