Merge branch 'cdalvaro/podman_support'
Some checks failed
continuous-integration/drone/push Build is failing
Some checks failed
continuous-integration/drone/push Build is failing
Closes #16
This commit is contained in:
commit
62a24686f7
@ -2,28 +2,40 @@
|
|||||||
# Verifies that files passed in are valid for docker-compose
|
# Verifies that files passed in are valid for docker-compose
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
if command -v docker &> /dev/null && docker help compose &> /dev/null; then
|
# Check if docker or podman commands are available
|
||||||
COMPOSE="docker compose"
|
if [[ -z "${CONTAINER_ENGINE}" ]]; then
|
||||||
elif command -v docker-compose &> /dev/null ; then
|
if command -v docker &>/dev/null; then
|
||||||
COMPOSE=docker-compose
|
CONTAINER_ENGINE=docker
|
||||||
|
elif command -v podman &>/dev/null; then
|
||||||
|
CONTAINER_ENGINE=podman
|
||||||
|
else
|
||||||
|
echo "ERROR: Neither 'docker' or 'podman' were found"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
if command -v "${CONTAINER_ENGINE}" &>/dev/null && ${CONTAINER_ENGINE} help compose &> /dev/null; then
|
||||||
|
COMPOSE="${CONTAINER_ENGINE} compose"
|
||||||
|
elif command -v "${CONTAINER_ENGINE}-compose" &> /dev/null; then
|
||||||
|
COMPOSE="${CONTAINER_ENGINE}-compose"
|
||||||
else
|
else
|
||||||
echo "ERROR: Neither 'docker-compose' or 'docker compose' were found"
|
echo "ERROR: Neither '${CONTAINER_ENGINE}-compose' or '${CONTAINER_ENGINE} compose' were found"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
check_file() {
|
check_file() {
|
||||||
local file=$1
|
local file=$1
|
||||||
env $COMPOSE --file "$file" config --quiet 2>&1 \
|
env $COMPOSE --file "$file" config --quiet 2>&1 |
|
||||||
| sed "/variable is not set. Defaulting/d"
|
sed "/variable is not set. Defaulting/d"
|
||||||
return "${PIPESTATUS[0]}"
|
return "${PIPESTATUS[0]}"
|
||||||
}
|
}
|
||||||
|
|
||||||
check_files() {
|
check_files() {
|
||||||
local all_files=( "$@" )
|
local all_files=( "$@" )
|
||||||
has_error=0
|
has_error=0
|
||||||
for file in "${all_files[@]}" ; do
|
for file in "${all_files[@]}"; do
|
||||||
if [[ -f "$file" ]]; then
|
if [[ -f "$file" ]]; then
|
||||||
if ! check_file "$file" ; then
|
if ! check_file "$file"; then
|
||||||
echo "ERROR: $file"
|
echo "ERROR: $file"
|
||||||
has_error=1
|
has_error=1
|
||||||
fi
|
fi
|
||||||
@ -32,7 +44,7 @@ check_files() {
|
|||||||
return $has_error
|
return $has_error
|
||||||
}
|
}
|
||||||
|
|
||||||
if ! check_files "$@" ; then
|
if ! check_files "$@"; then
|
||||||
echo "Some compose files failed"
|
echo "Some compose files failed"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user