mirror of
https://github.com/levogevo/ffmpeg-builder.git
synced 2026-01-15 19:06:17 +00:00
more basename trickery
This commit is contained in:
@@ -84,7 +84,7 @@ docker_build_image() {
|
|||||||
# docker expects colon instead of dash
|
# docker expects colon instead of dash
|
||||||
dockerDistro="${distro//-/:}"
|
dockerDistro="${distro//-/:}"
|
||||||
# specific file for evaluated package manager info
|
# 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
|
# get package manager info
|
||||||
|
|
||||||
# TODO REMOVE
|
# TODO REMOVE
|
||||||
@@ -109,7 +109,7 @@ docker_build_image() {
|
|||||||
cat "${distroPkgMgr}"
|
cat "${distroPkgMgr}"
|
||||||
source "${distroPkgMgr}"
|
source "${distroPkgMgr}"
|
||||||
|
|
||||||
dockerfile="${DOCKER_DIR}/Dockerfile_${distro}"
|
dockerfile="${DOCKER_DIR}/Dockerfile_$(bash_basename "${distro}")"
|
||||||
{
|
{
|
||||||
echo "FROM ${dockerDistro}"
|
echo "FROM ${dockerDistro}"
|
||||||
echo 'SHELL ["/bin/bash", "-c"]'
|
echo 'SHELL ["/bin/bash", "-c"]'
|
||||||
|
|||||||
Reference in New Issue
Block a user