7x31
/
mailcow-dockerized
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add check for patch utility in case of podman

This commit is contained in:
Roy Lenferink 2023-01-12 13:25:24 +01:00
parent 17094f14b7
commit 18ad7b018d
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
generate_config.sh
View File

@ -32,17 +32,21 @@ if command -v podman > /dev/null 2>&1; then
else else
CONTAINER_SOCKET="/run/user/${UID}/podman/podman.sock" CONTAINER_SOCKET="/run/user/${UID}/podman/podman.sock"
fi fi
# To patch the docker-compose file for use with podman
EXTRA_REQUIRED_PACKAGES="patch"
elif command -v docker > /dev/null 2>&1; then elif command -v docker > /dev/null 2>&1; then
CONTAINER_ENGINE="docker" CONTAINER_ENGINE="docker"
echo -e "\e[32mFound Docker container engine.\e[0m" echo -e "\e[32mFound Docker container engine.\e[0m"
CONTAINER_SOCKET="/var/run/docker.sock" CONTAINER_SOCKET="/var/run/docker.sock"
EXTRA_REQUIRED_PACKAGES=""
else else
echo "Cannot find container engine (Docker or Podman), exiting..." echo "Cannot find container engine (Docker or Podman), exiting..."
exit 1 exit 1
fi fi
for bin in openssl curl git awk sha1sum; do for bin in openssl curl git awk sha1sum ${EXTRA_REQUIRED_PACKAGES}; do
if [[ -z $(which ${bin}) ]]; then if [[ -z $(which ${bin}) ]]; then
echo "Cannot find ${bin}, exiting..." echo "Cannot find ${bin}, exiting..."
exit 1 exit 1

6
update.sh
View File

@ -235,18 +235,22 @@ if [[ -z "${MAILCOW_CONTAINER_ENGINE}" ]]; then
else else
CONTAINER_SOCKET="/run/user/${UID}/podman/podman.sock" CONTAINER_SOCKET="/run/user/${UID}/podman/podman.sock"
fi fi
# To patch the docker-compose file for use with podman
EXTRA_REQUIRED_PACKAGES="patch"
elif command -v docker > /dev/null 2>&1; then elif command -v docker > /dev/null 2>&1; then
MAILCOW_CONTAINER_ENGINE="docker" MAILCOW_CONTAINER_ENGINE="docker"
echo -e "\e[32mFound Docker container engine.\e[0m" echo -e "\e[32mFound Docker container engine.\e[0m"
CONTAINER_SOCKET="/var/run/docker.sock" CONTAINER_SOCKET="/var/run/docker.sock"
EXTRA_REQUIRED_PACKAGES=""
else else
echo "Cannot find container engine (Docker or Podman), exiting..." echo "Cannot find container engine (Docker or Podman), exiting..."
exit 1 exit 1
fi fi
fi fi
for bin in curl git awk sha1sum; do for bin in curl git awk sha1sum ${EXTRA_REQUIRED_PACKAGES}; do
if [[ -z $(command -v ${bin}) ]]; then if [[ -z $(command -v ${bin}) ]]; then
echo "Cannot find ${bin}, exiting..." echo "Cannot find ${bin}, exiting..."
exit 1 exit 1