docker: fix issues with quickstart docker compose script.
* Fix installing the wrong Docker package on Ubuntu. * Fix the package install steps asking for confirmation. * Fix missing sudo calls in a couple places.
This commit is contained in:
35
bin/danbooru
35
bin/danbooru
@@ -15,34 +15,45 @@
|
|||||||
#
|
#
|
||||||
# This script is just a wrapper for that command.
|
# This script is just a wrapper for that command.
|
||||||
|
|
||||||
|
set -euxo pipefail
|
||||||
|
|
||||||
|
# Check if program exists.
|
||||||
|
has() {
|
||||||
|
type -p "$1" > /dev/null
|
||||||
|
}
|
||||||
|
|
||||||
|
# Install Docker and Docker Compose if they're not installed already.
|
||||||
install_docker_compose() {
|
install_docker_compose() {
|
||||||
if docker-compose version > /dev/null; then
|
if has docker && has docker-compose; then
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if apt --version; then
|
# Debian and Ubuntu
|
||||||
sudo apt install docker docker-compose
|
if has apt-get; then
|
||||||
elif dnf --version; then
|
sudo apt-get update
|
||||||
sudo dnf install docker docker-compose
|
sudo apt-get install -y docker.io docker-compose
|
||||||
elif pacman --version; then
|
# Fedora
|
||||||
sudo pacman -Sy docker docker-compose
|
elif has dnf; then
|
||||||
|
sudo dnf install -y docker docker-compose
|
||||||
|
# Arch Linux
|
||||||
|
elif has pacman; then
|
||||||
|
sudo pacman -Sy --noconfirm docker docker-compose
|
||||||
else
|
else
|
||||||
echo "Error: Couldn't automatically install docker-compose. Install docker-compose manually."
|
echo "Error: Couldn't automatically install docker-compose. Install docker-compose manually."
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# Start Docker if it's not running already.
|
||||||
start_docker() {
|
start_docker() {
|
||||||
if docker version > /dev/null; then
|
if ! sudo docker version > /dev/null; then
|
||||||
return
|
sudo systemctl start docker
|
||||||
fi
|
fi
|
||||||
|
|
||||||
sudo systemctl start docker
|
|
||||||
}
|
}
|
||||||
|
|
||||||
docker_compose() {
|
docker_compose() {
|
||||||
COMPOSE_FILE="$(dirname "$(realpath "$0")")/../config/docker/docker-compose.simple.yaml"
|
COMPOSE_FILE="$(dirname "$(realpath "$0")")/../config/docker/docker-compose.simple.yaml"
|
||||||
docker-compose -f "$COMPOSE_FILE" "$@"
|
sudo docker-compose -f "$COMPOSE_FILE" "$@"
|
||||||
}
|
}
|
||||||
|
|
||||||
install_docker_compose
|
install_docker_compose
|
||||||
|
|||||||
Reference in New Issue
Block a user