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

diff --git a/scripts/docker/exec.bash b/scripts/docker/exec.bash
index cb6a665..9874c9a 100755
--- a/scripts/docker/exec.bash
+++ b/scripts/docker/exec.bash
@@ -9,15 +9,20 @@
 
 IMAGE="${IMAGE:-archlinux-build}"
 
+image_name="localhorsttv/${IMAGE}"
+image_path="scripts/docker/${IMAGE//:/-}"
+
+build_cmd="cd /repo && make -j\$(nproc) $TARGETS"
+
 local_conf=""
 
 if [[ "$TARGETS" == *codecov* ]]; then
 	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"
+if [ -e "${image_path}/env" ]; then
+	local_conf="$local_conf --env-file ${image_path}/env"
 fi
 
-docker build -t "blank/${IMAGE}" scripts/docker/"${IMAGE}"
-docker run -v "$PWD":/repo ${local_conf} "blank/${IMAGE}" /bin/bash -c "cd /repo && make -j\$(nproc) $TARGETS"
+docker build -t "${image_name}" --pull=true "${image_path}"
+docker run -v "$PWD":/repo ${local_conf} "${image_name}" /bin/bash -c "${build_cmd}"