Fixed docker compose back

This commit is contained in:
root 2024-11-18 15:03:12 +00:00
parent 60a0b73e54
commit 889538c721
28 changed files with 52 additions and 52 deletions

View File

@ -219,7 +219,7 @@ uninstall_authelia() {
echo -ne "* Uninstalling authelia container.."
# First stop the service
cd /federated/apps/authelia && docker-compose -f docker-compose.yml -p authelia down &> /dev/null
cd /federated/apps/authelia && docker compose -f docker-compose.yml -p authelia down &> /dev/null
# Delete the entries in the settings table
[[ -d "/federated/apps/pdnsmysql/data/var/lib/mysql/pdnsadmin" ]] && POWERDNS_DB="pdnsadmin" || POWERDNS_DB="pdns"

View File

@ -167,7 +167,7 @@ uninstall_baserow() {
SPINPID=$!
# First stop the service
cd /federated/apps/baserow && docker-compose -f docker-compose.yml -p baserow down &> /dev/null
cd /federated/apps/baserow && docker compose -f docker-compose.yml -p baserow down &> /dev/null
# Delete database and user in postgresql
docker exec postgresql psql -U postgres -c "DROP DATABASE baserow" &> /dev/null

View File

@ -174,7 +174,7 @@ uninstall_bookstack() {
echo -ne "* Uninstalling bookstack container.."
# First stop the service
cd /federated/apps/bookstack && docker-compose -f docker-compose.yml -p bookstack down &> /dev/null
cd /federated/apps/bookstack && docker compose -f docker-compose.yml -p bookstack down &> /dev/null
# Delete database and user
docker exec pdnsmysql bash -c "mysql -uroot -p$MYSQL_ROOTPASSWORD -e 'drop database bookstack;'" &> /dev/null

View File

@ -188,7 +188,7 @@ uninstall_caddy() {
SPINPID=$!
# First stop the service
cd /federated/apps/caddy && docker-compose -f docker-compose.yml -p caddy down &> /dev/null
cd /federated/apps/caddy && docker compose -f docker-compose.yml -p caddy down &> /dev/null
# Delete the app directory
rm -rf /federated/apps/caddy

View File

@ -168,7 +168,7 @@ uninstall_castopod() {
SPINPID=$!
# First stop the service
cd /federated/apps/castopod && docker-compose -f docker-compose.yml -p castopod down &> /dev/null
cd /federated/apps/castopod && docker compose -f docker-compose.yml -p castopod down &> /dev/null
# Delete database and user
docker exec pdnsmysql bash -c "mysql -uroot -p$MYSQL_ROOTPASSWORD -e 'drop database castopod;'" &> /dev/null

View File

@ -71,10 +71,10 @@ start_connector() {
if [ $DEBUG ]; then
# Start /federated/apps/connector with output to console for debug
docker-compose -f /federated/apps/connector/docker-compose.yml -p connector up
docker compose -f /federated/apps/connector/docker-compose.yml -p connector up
[ $? -eq 0 ] && echo -ne "done.\n" || fail "There was a problem starting service /federated/apps/connector"
else
docker-compose -f /federated/apps/connector/docker-compose.yml -p connector up -d &> /dev/null
docker compose -f /federated/apps/connector/docker-compose.yml -p connector up -d &> /dev/null
# Keep trying connector port 80 to make sure it's up
# before we proceed
@ -85,7 +85,7 @@ start_connector() {
break
else
if [ "$RETRY" == 1 ]; then
docker-compose -f /federated/apps/connector/docker-compose.yml -p connector down &> /dev/null
docker compose -f /federated/apps/connector/docker-compose.yml -p connector down &> /dev/null
kill -9 $SPINPID &> /dev/null
fail "There was a problem starting service /federated/apps/connector\nCheck the output of 'docker logs connector' or turn on\ndebug with -d"
fi

View File

@ -75,7 +75,7 @@ uninstall_dashboard() {
SPINPID=$!
# First stop the service
cd /federated/apps/dashboard && docker-compose -f docker-compose.yml -p dashboard down &> /dev/null
cd /federated/apps/dashboard && docker compose -f docker-compose.yml -p dashboard down &> /dev/null
# Delete the app directory
rm -rf /federated/apps/dashboard

View File

@ -193,7 +193,7 @@ uninstall_discourse() {
SPINPID=$!
# First stop the service
cd /federated/apps/discourse && docker-compose -f docker-compose.yml -p discourse down &> /dev/null
cd /federated/apps/discourse && docker compose -f docker-compose.yml -p discourse down &> /dev/null
# Delete database and user in postgresql
docker exec postgresql psql -U postgres -c "DROP DATABASE discourse" &> /dev/null

View File

@ -207,11 +207,11 @@ start_dns() {
if [ $DEBUG ]; then
# Start /federated/apps/dns with output to console for debug
docker-compose -f /federated/apps/dns/docker-compose.yml -p dns up
docker compose -f /federated/apps/dns/docker-compose.yml -p dns up
[ $? -eq 0 ] && echo -ne "done.\n" || fail "There was a problem starting service /federated/apps/dns"
else
# Start /federated/apps/dns with output to /dev/null
docker-compose -f /federated/apps/dns/docker-compose.yml -p dns up -d &> /dev/null
docker compose -f /federated/apps/dns/docker-compose.yml -p dns up -d &> /dev/null
# Keep trying to see that certificates are generated
RETRY="18"
@ -231,7 +231,7 @@ start_dns() {
break
else
if [ "$RETRY" == 1 ]; then
docker-compose -f /federated/apps/dns/docker-compose.yml -p dns down &> /dev/null
docker compose -f /federated/apps/dns/docker-compose.yml -p dns down &> /dev/null
fail "There was a problem starting service /federated/apps/dns\nCheck the output of 'docker logs dns' or turn on\ndebug with -d"
fi
((RETRY--))

View File

@ -178,7 +178,7 @@ uninstall_espocrm() {
echo -ne "* Uninstalling espocrm container.."
# First stop the service
cd /federated/apps/espocrm && docker-compose -f docker-compose.yml -p espocrm down &> /dev/null
cd /federated/apps/espocrm && docker compose -f docker-compose.yml -p espocrm down &> /dev/null
# Delete database and user
docker exec pdnsmysql bash -c "mysql -uroot -p$MYSQL_ROOTPASSWORD -e 'drop database espocrm;'" &> /dev/null

View File

@ -166,7 +166,7 @@ uninstall_freescout() {
SPINPID=$!
# First stop the service
cd /federated/apps/freescout && docker-compose -f docker-compose.yml -p freescout down &> /dev/null
cd /federated/apps/freescout && docker compose -f docker-compose.yml -p freescout down &> /dev/null
# Delete database and user in postgresql
docker exec postgresql psql -U postgres -c "DROP DATABASE freescout" &> /dev/null

View File

@ -141,7 +141,7 @@ upgrade_federated() {
echo -ne "upgrading to $VERSION..\n"
if [[ ! "$APP_NOTRUNNING" ]]; then
echo -ne "\n Shutting Down $APP.."
cd /federated/apps/$APP && docker-compose -f docker-compose.yml -p $APP down
cd /federated/apps/$APP && docker compose -f docker-compose.yml -p $APP down
fi
if [ "$APP" = "jitsi" ]; then
sed -i "s/#JITSI_IMAGE_VERSION=.*/JITSI_IMAGE_VERSION=$VERSION/g" /federated/apps/$APP/.env
@ -197,7 +197,7 @@ start_service_convert() {
# Start /federated/apps/SERVICE with output to /dev/null
echo -ne "\n* Starting /federated/apps/$SERVICE service.."
docker-compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE up -d &> /dev/null
docker compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE up -d &> /dev/null
# Keep trying service port to make sure it's up before
# we proceed
@ -208,7 +208,7 @@ start_service_convert() {
break
else
if [ "$RETRY" == 1 ]; then
docker-compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE down &> /dev/null
docker compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE down &> /dev/null
fail "There was a problem starting service /federated/apps/$SERVICE\nCheck the output of 'docker logs $SERVICE' or turn on\ndebug with -d"
fi
((RETRY--))
@ -225,10 +225,10 @@ start_service_upgrade() {
if [ $DEBUG ]; then
# Start /federated/apps/SERVICE with output to console for debug
docker-compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE up
docker compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE up
[ $? -eq 0 ] && echo -ne "done.\n" || fail "There was a problem starting service /federated/apps/$SERVICE"
else
docker-compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE up -d &> /dev/null
docker compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE up -d &> /dev/null
# Keep trying service port to make sure it's up before
# we proceed
@ -239,7 +239,7 @@ start_service_upgrade() {
break
else
if [ "$RETRY" == 1 ]; then
docker-compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE down &> /dev/null
docker compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE down &> /dev/null
fail "There was a problem starting service /federated/apps/$SERVICE\nCheck the output of 'docker logs $SERVICE' or turn on\ndebug with -d"
fi
((RETRY--))
@ -255,7 +255,7 @@ start_service_withalert2() {
ALERT="$4"
# First start the service
docker-compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE up -d &> /dev/null
docker compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE up -d &> /dev/null
# Keep trying service COMMAND to make sure it's up before we proceed
while [ "$RETRY" -gt "0" ]; do
@ -271,13 +271,13 @@ start_service_withalert2() {
if [ "$ALERT" = "yes" ]; then
EXTERNALIP=`dig @resolver4.opendns.com myip.opendns.com +short 2> /dev/null`
docker-compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE down &> /dev/null
docker compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE down &> /dev/null
echo "Generated by /federated/bin/start" > /federated/apps/mail/data/root/certs/mailfile
docker exec mail bash -c "mail -r admin@$DOMAIN -a \"Content-type: text/html\" -s \"$SERVICE failed to start on $EXTERNALIP\" $ALERTS_EMAIL < /root/certs/mailfile"
echo -ne "\nThere was a problem starting service /federated/apps/$SERVICE\nCheck the output of 'docker logs $SERVICE' while starting or run\ndocker-compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE up\n"
echo -ne "\nThere was a problem starting service /federated/apps/$SERVICE\nCheck the output of 'docker logs $SERVICE' while starting or run\ndocker compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE up\n"
else
docker-compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE down &> /dev/null
echo -ne "\nThere was a problem starting service /federated/apps/$SERVICE\nCheck the output of 'docker logs $SERVICE' while starting or run\ndocker-compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE up\n"
docker compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE down &> /dev/null
echo -ne "\nThere was a problem starting service /federated/apps/$SERVICE\nCheck the output of 'docker logs $SERVICE' while starting or run\ndocker compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE up\n"
fi
echo -ne "\n"
fi
@ -294,7 +294,7 @@ start_service_withalert() {
echo -ne "* Starting $SERVICE.."
docker-compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE up -d &> /dev/null
docker compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE up -d &> /dev/null
# Keep trying service port to make sure it's up before
# we proceed
@ -310,12 +310,12 @@ start_service_withalert() {
if [ "$ALERT" = "yes" ]; then
EXTERNALIP=`dig @resolver4.opendns.com myip.opendns.com +short 2> /dev/null`
docker-compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE down &> /dev/null
docker compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE down &> /dev/null
echo "Generated by /federated/bin/start" > /federated/apps/mail/data/root/certs/mailfile
docker exec mail bash -c "mail -r admin@$DOMAIN -a \"Content-type: text/html\" -s \"$SERVICE failed to start on $EXTERNALIP\" $ALERTS_EMAIL < /root/certs/mailfile"
echo -ne "\n\nThere was a problem starting service /federated/apps/$SERVICE\nCheck the output of 'docker logs $SERVICE' or turn on\ndebug with set -x\n\n"
else
docker-compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE down &> /dev/null
docker compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE down &> /dev/null
echo -ne "\n\nThere was a problem starting service /federated/apps/$SERVICE\nCheck the output of 'docker logs $SERVICE' or turn on\ndebug with set -x\n\n"
fi
fi
@ -334,10 +334,10 @@ start_service() {
if [ $DEBUG ]; then
# Start /federated/apps/SERVICE with output to console for debug
docker-compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE up
docker compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE up
[ $? -eq 0 ] && echo -ne "done.\n" || fail "There was a problem starting service /federated/apps/$SERVICE"
else
docker-compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE up -d &> /dev/null
docker compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE up -d &> /dev/null
# Keep trying service port to make sure it's up before
# we proceed
@ -347,7 +347,7 @@ start_service() {
break
else
if [ "$RETRY" == 1 ]; then
docker-compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE down &> /dev/null
docker compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE down &> /dev/null
kill -9 $SPINPID &> /dev/null
fail "There was a problem starting service /federated/apps/$SERVICE\nCheck the output of 'docker logs $SERVICE' or turn on\ndebug with set -x"
fi

View File

@ -243,7 +243,7 @@ uninstall_gitea() {
echo -ne "* Uninstalling gitea container.."
# First stop the service
cd /federated/apps/gitea && docker-compose -f docker-compose.yml -p gitea down &> /dev/null
cd /federated/apps/gitea && docker compose -f docker-compose.yml -p gitea down &> /dev/null
# Delete database and user in postgresql
docker exec postgresql psql -U postgres -c "DROP DATABASE gitea" &> /dev/null

View File

@ -746,7 +746,7 @@ uninstall_jitsi() {
echo -ne "* Uninstalling jitsi container.."
# First stop the service
cd /federated/apps/jitsi && docker-compose -f docker-compose.yml -p jitsi down &> /dev/null
cd /federated/apps/jitsi && docker compose -f docker-compose.yml -p jitsi down &> /dev/null
# Delete the app directory
rm -rf /federated/apps/jitsi
@ -769,7 +769,7 @@ uninstall_jitsi() {
fi
if [[ -d "/federated/apps/jitsiopenid" ]]; then
cd /federated/apps/jitsiopenid && docker-compose -f docker-compose.yml -p jitsiopenid down &> /dev/null
cd /federated/apps/jitsiopenid && docker compose -f docker-compose.yml -p jitsiopenid down &> /dev/null
rm -rf /federated/apps/jitsiopenid
docker image rm mod242/jitsi-go-openid:latest &> /dev/null
fi

View File

@ -77,7 +77,7 @@ echo -ne "done."
}
start_listmonk() {
# Install the database scheme first
docker-compose -f /federated/apps/listmonk/docker-compose.yml run --rm listmonk ./listmonk --install --yes &> /dev/null
docker compose -f /federated/apps/listmonk/docker-compose.yml run --rm listmonk ./listmonk --install --yes &> /dev/null
# Change app.root_url and other settings to our domain
docker exec postgresql psql -U listmonk -c "update settings set value='\"http://listmonk.$DOMAIN\"' where key='app.root_url'" &> /dev/null
@ -176,7 +176,7 @@ uninstall_listmonk() {
SPINPID=$!
# First stop the service
cd /federated/apps/listmonk && docker-compose -f docker-compose.yml -p listmonk down &> /dev/null
cd /federated/apps/listmonk && docker compose -f docker-compose.yml -p listmonk down &> /dev/null
# Delete database and user in postgresql
docker exec postgresql psql -U postgres -c "DROP DATABASE listmonk" &> /dev/null

View File

@ -302,7 +302,7 @@ uninstall_mail() {
echo -ne "* Uninstalling mail container.."
# First stop the service
cd /federated/apps/mail && docker-compose -f docker-compose.yml -p mail down &> /dev/null
cd /federated/apps/mail && docker compose -f docker-compose.yml -p mail down &> /dev/null
# Delete the app directory
rm -rf /federated/apps/mail

View File

@ -220,7 +220,7 @@ uninstall_matrix() {
echo -ne "* Uninstalling matrix container.."
# First stop the service
cd /federated/apps/matrix && docker-compose -f docker-compose.yml -p matrix down &> /dev/null
cd /federated/apps/matrix && docker compose -f docker-compose.yml -p matrix down &> /dev/null
# Delete database and user in postgresql
docker exec postgresql psql -U postgres -c "DROP DATABASE matrix" &> /dev/null

View File

@ -87,7 +87,7 @@ uninstall_matrixsignal() {
SPINPID=$!
# First stop the service
cd /federated/apps/matrixsignal && docker-compose -f docker-compose.yml -p matrixsignal down &> /dev/null
cd /federated/apps/matrixsignal && docker compose -f docker-compose.yml -p matrixsignal down &> /dev/null
# Delete database and user in postgresql
docker exec postgresql psql -U postgres -c "DROP DATABASE matrixsignal" &> /dev/null

View File

@ -87,7 +87,7 @@ uninstall_matrixslack() {
SPINPID=$!
# First stop the service
cd /federated/apps/matrixslack && docker-compose -f docker-compose.yml -p matrixslack down &> /dev/null
cd /federated/apps/matrixslack && docker compose -f docker-compose.yml -p matrixslack down &> /dev/null
# Delete database and user in postgresql
docker exec postgresql psql -U postgres -c "DROP DATABASE matrixslack" &> /dev/null

View File

@ -87,7 +87,7 @@ uninstall_matrixwhatsapp() {
SPINPID=$!
# First stop the service
cd /federated/apps/matrixwhatsapp && docker-compose -f docker-compose.yml -p matrixwhatsapp down &> /dev/null
cd /federated/apps/matrixwhatsapp && docker compose -f docker-compose.yml -p matrixwhatsapp down &> /dev/null
# Delete database and user in postgresql
docker exec postgresql psql -U postgres -c "DROP DATABASE matrixwhatsapp" &> /dev/null

View File

@ -152,7 +152,7 @@ uninstall_msp() {
SPINPID=$!
# First stop the service
cd /federated/apps/msp && docker-compose -f docker-compose.yml -p msp down &> /dev/null
cd /federated/apps/msp && docker compose -f docker-compose.yml -p msp down &> /dev/null
# Delete the app directory
rm -rf /federated/apps/msp

View File

@ -316,7 +316,7 @@ uninstall_nextcloud() {
echo -ne "* Uninstalling nextcloud container.."
# First stop the service
cd /federated/apps/nextcloud && docker-compose -f docker-compose.yml -p nextcloud down &> /dev/null
cd /federated/apps/nextcloud && docker compose -f docker-compose.yml -p nextcloud down &> /dev/null
# Delete database and user in postgresql
docker exec postgresql psql -U postgres -c "DROP DATABASE nextcloud" &> /dev/null

View File

@ -63,7 +63,7 @@ uninstall_redis() {
SPINPID=$!
# First stop the service
cd /federated/apps/redis && docker-compose -f docker-compose.yml -p redis down &> /dev/null
cd /federated/apps/redis && docker compose -f docker-compose.yml -p redis down &> /dev/null
# Delete the app directory
rm -rf /federated/apps/redis

View File

@ -111,7 +111,7 @@ uninstall_roundcube() {
echo -ne "* Uninstalling roundcube container.."
# First stop the service
cd /federated/apps/roundcube && docker-compose -f docker-compose.yml -p roundcube down &> /dev/null
cd /federated/apps/roundcube && docker compose -f docker-compose.yml -p roundcube down &> /dev/null
# Delete database and user
docker exec pdnsmysql bash -c "mysql -uroot -p$MYSQL_ROOTPASSWORD -e 'drop database roundcube;'" &> /dev/null

View File

@ -101,11 +101,11 @@ start_traefik_old() {
if [ $DEBUG ]; then
# Start /federated/apps/traefik with output to console for debug
docker-compose -f /federated/apps/traefik/docker-compose.yml -p traefik up
docker compose -f /federated/apps/traefik/docker-compose.yml -p traefik up
[ $? -eq 0 ] && echo -ne "done.\n" || fail "There was a problem starting service /federated/apps/traefik"
else
# Start /federated/apps/traefik with output to /dev/null
docker-compose -f /federated/apps/traefik/docker-compose.yml -p traefik up -d &> /dev/null
docker compose -f /federated/apps/traefik/docker-compose.yml -p traefik up -d &> /dev/null
# Keep trying to see that certificates are generated
RETRY="20"
@ -120,7 +120,7 @@ start_traefik_old() {
break
else
if [ "$RETRY" == 1 ]; then
docker-compose -f /federated/apps/traefik/docker-compose.yml -p traefik down &> /dev/null
docker compose -f /federated/apps/traefik/docker-compose.yml -p traefik down &> /dev/null
fail "There was a problem starting service /federated/apps/traefik\nCheck the output of 'docker logs traefik' or turn on\ndebug with -d"
fi
((RETRY--))

View File

@ -81,7 +81,7 @@ uninstall_vaultwarden() {
SPINPID=$!
# First stop the service
cd /federated/apps/vaultwarden && docker-compose -f docker-compose.yml -p vaultwarden down &> /dev/null
cd /federated/apps/vaultwarden && docker compose -f docker-compose.yml -p vaultwarden down &> /dev/null
# Delete database and user in postgresql
docker exec postgresql psql -U postgres -c "DROP DATABASE vaultwarden" &> /dev/null

View File

@ -138,7 +138,7 @@ uninstall_wireguard() {
SPINPID=$!
# First stop the service
cd /federated/apps/wireguard && docker-compose -f docker-compose.yml -p wireguard down &> /dev/null
cd /federated/apps/wireguard && docker compose -f docker-compose.yml -p wireguard down &> /dev/null
# Delete the app directory
rm -rf /federated/apps/wireguard

View File

@ -173,7 +173,7 @@ uninstall_wordpress() {
echo -ne "* Uninstalling wordpress container.."
# First stop the service
cd /federated/apps/wordpress && docker-compose -f docker-compose.yml -p wordpress down &> /dev/null
cd /federated/apps/wordpress && docker compose -f docker-compose.yml -p wordpress down &> /dev/null
# Delete database and user
docker exec pdnsmysql bash -c "mysql -uroot -p$MYSQL_ROOTPASSWORD -e 'drop database wordpress;'" &> /dev/null