X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=scripts%2Fdocker%2Fexec.bash;h=cb6a6651b8d84b376f78607cb75e59671e33cb5c;hb=bef504fb3ed7cf0a830cbe7fb74bddc682c03d19;hp=b146e7647e712ac85e767f08502776a8736614b1;hpb=f6e33d9f79ff6a47c3efa3c9fb1206cc1d27ecde;p=blank.git

diff --git a/scripts/docker/exec.bash b/scripts/docker/exec.bash
index b146e76..cb6a665 100755
--- a/scripts/docker/exec.bash
+++ b/scripts/docker/exec.bash
@@ -9,9 +9,15 @@
 
 IMAGE="${IMAGE:-archlinux-build}"
 
+local_conf=""
+
 if [[ "$TARGETS" == *codecov* ]]; then
-	ci_env=`bash <(curl -s https://codecov.io/env)`
+	local_conf="$local_conf $(bash <(curl -s https://codecov.io/env))"
+fi
+
+if [ -e scripts/docker/"${IMAGE}"/env ]; then
+	local_conf="$local_conf --env-file scripts/docker/${IMAGE}/env"
 fi
 
 docker build -t "blank/${IMAGE}" scripts/docker/"${IMAGE}"
-docker run -v "$PWD":/repo ${ci_env} "blank/${IMAGE}" /bin/bash -c "cd /repo && make -j\$(nproc) $TARGETS"
+docker run -v "$PWD":/repo ${local_conf} "blank/${IMAGE}" /bin/bash -c "cd /repo && make -j\$(nproc) $TARGETS"