From 390d50e8cb5972a9a77d4b637dc24adafc92bd7e Mon Sep 17 00:00:00 2001 From: Levon Gevorgyan Date: Fri, 8 Aug 2025 21:48:21 -0500 Subject: [PATCH] more basename trickery --- lib/docker.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/docker.sh b/lib/docker.sh index 4606940..d7fabbf 100644 --- a/lib/docker.sh +++ b/lib/docker.sh @@ -84,7 +84,7 @@ docker_build_image() { # docker expects colon instead of dash dockerDistro="${distro//-/:}" # specific file for evaluated package manager info - distroPkgMgr="${DOCKER_DIR}/$(bash_basename "${distro}-pkg_mgr")" + distroPkgMgr="${DOCKER_DIR}/$(bash_basename "${distro}")-pkg_mgr)" # get package manager info # TODO REMOVE @@ -109,7 +109,7 @@ docker_build_image() { cat "${distroPkgMgr}" source "${distroPkgMgr}" - dockerfile="${DOCKER_DIR}/Dockerfile_${distro}" + dockerfile="${DOCKER_DIR}/Dockerfile_$(bash_basename "${distro}")" { echo "FROM ${dockerDistro}" echo 'SHELL ["/bin/bash", "-c"]'