mirror of
https://github.com/levogevo/ffmpeg-builder.git
synced 2026-01-15 19:06:17 +00:00
fix archlinux image
This commit is contained in:
@@ -79,12 +79,12 @@ docker_build_image() {
|
|||||||
|
|
||||||
for distro in "${DISTROS[@]}"; do
|
for distro in "${DISTROS[@]}"; do
|
||||||
echo_info "sourcing package manager for ${distro}"
|
echo_info "sourcing package manager for ${distro}"
|
||||||
|
local dockerDistro="${distro}"
|
||||||
# custom multi-arch image for archlinux
|
# custom multi-arch image for archlinux
|
||||||
test "${distro}" == 'archlinux-latest' && \
|
test "${distro}" == 'archlinux-latest' && \
|
||||||
distro='ogarcia/archlinux-latest'
|
dockerDistro='ogarcia/archlinux-latest'
|
||||||
# docker expects colon instead of dash
|
# docker expects colon instead of dash
|
||||||
dockerDistro="${distro//-/:}"
|
dockerDistro="${dockerDistro//-/:}"
|
||||||
# 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
|
||||||
@@ -211,10 +211,6 @@ docker_run_image() {
|
|||||||
check_docker || return 1
|
check_docker || return 1
|
||||||
|
|
||||||
for distro in "${DISTROS[@]}"; do
|
for distro in "${DISTROS[@]}"; do
|
||||||
# custom multi-arch image for arch
|
|
||||||
test "${distro}" == 'archlinux-latest' && \
|
|
||||||
distro='ogarcia/archlinux-latest'
|
|
||||||
# docker expects colon instead of dash
|
|
||||||
dockerDistro="${distro//-/:}"
|
dockerDistro="${distro//-/:}"
|
||||||
|
|
||||||
# TODO REMOVE
|
# TODO REMOVE
|
||||||
|
|||||||
Reference in New Issue
Block a user