diff --git a/etherpad-docker.sh b/etherpad-docker.sh index 5788d37..b7f6f7c 100644 --- a/etherpad-docker.sh +++ b/etherpad-docker.sh @@ -59,20 +59,8 @@ PSGVER="$(apt-cache madison postgresql|tr -d '[:blank:]'|awk -F'[|+]' 'NR==1{pri ETHERPAD_DB_USER="dockerpad" ETHERPAD_DB_NAME="etherpad" ETHERPAD_DB_PASS="$(tr -dc "a-zA-Z0-9#*=" < /dev/urandom | fold -w 10 | head -n1)" -DOCKER_CE_REPO="$(check_apt_policy docker)" WS_CONF_MATCH1="# ensure all static content can always be found first" -echo "Add Docker repo" -if [ "$DOCKER_CE_REPO" = "stable" ]; then - echo "Docker repository already installed" -else - echo "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" > \ - /etc/apt/sources.list.d/docker-ce.list - wget -qO - https://download.docker.com/linux/ubuntu/gpg | \ - gpg --dearmor | tee /etc/apt/trusted.gpg.d/docker-gpg-key.gpg >/dev/null - apt-get -q2 update -fi - read -p "Set your etherpad docker admin password: " -r ETHERPAD_ADMIN_PASS # Make sure we can rely on the match strings. @@ -80,7 +68,7 @@ printf "> Testing match strings on config files.\n" test_match "$WS_MATCH1" "$WS_CONF" # Install required packages -install_ifnot docker-ce +install_ifnot docker.io install_ifnot postgresql-"$PSGVER" # Create DB