From 8d8fb59ebacec5e2c2119bc0fae756bd63abca49 Mon Sep 17 00:00:00 2001
From: Robert Günzler <r@gnzler.io>
Date: Mon, 26 Apr 2021 02:01:16 +0200
Subject: bin/enter: name the image after the directory/file

---
 bin/enter | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'bin')

diff --git a/bin/enter b/bin/enter
index bd68daa..64e5b68 100755
--- a/bin/enter
+++ b/bin/enter
@@ -43,7 +43,11 @@ done
 shift $((OPTIND - 1))
 
 if [ -z "$img" ]; then
-	img="$(basename "$(dirname "$(readlink -f -- "$dockerfile")")")"
+	name="$(basename "$dockerfile" | cut -d'.' -f1 | tr '[:upper:]' '[:lower:]')" # support <name>.Dockerfile
+	scope="$(basename "$(dirname "$(readlink -f -- "$dockerfile")")" | tr '[:upper:]' '[:lower:]')"
+	# fall back to directory name
+	[ "$name" = "Dockerfile" ] && name="$scope"
+	img="${scope}/${name}"
 
 	# allow setting this to some non-file value to skip building
 	# > enter -i alpine -f none
@@ -80,6 +84,8 @@ ep="sh"
 
 [ -n "$verbose" ] && { set -x; }
 
-exec docker run --rm -it \
+cname=$(mktemp --dry-run enterXXXX)
+exec docker run --name "$cname" --rm -i \
+	--uts host \
 	--entrypoint="$ep" \
 	--mount=type=bind,src="$cwd",dst=/src -w /src $extra_args "$img" $@
-- 
cgit 1.4.1