diff --git a/docker/docker-compose-x86.yaml b/docker/docker-compose.yaml similarity index 79% rename from docker/docker-compose-x86.yaml rename to docker/docker-compose.yaml index d95ac4b..a96f49f 100644 --- a/docker/docker-compose-x86.yaml +++ b/docker/docker-compose.yaml @@ -15,7 +15,7 @@ services: rm /var/www/html/LocalSettings.php; rm /var/www/html/includes/PlatformSettings.php; rm -r /var/www/html/images; - ln -s /mediawiki_data/config/LocalSettings.php /var/www/html/LocalSettings.php; + ln -s /mediawiki_data/config/LocalSettings.php /var/www/html/LocalSettings.php; ln -s /mediawiki_data/config/PlatformSettings.php /var/www/html/includes/PlatformSettings.php; ln -s /mediawiki_data/images /var/www/html/images; apache2-foreground;" @@ -26,22 +26,22 @@ services: restart: unless-stopped environment: MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD} - volumes: + volumes: - db_data:/var/lib/mysql duplicati: - image: duplicati-sqlclient:latest + image: duplicati-mysqlclient:latest container_name: limbowiki_duplicati environment: - - DB_HOST=db - - DB_NAME=${MYSQL_DATABASE} - - DB_USER=${MYSQL_USER} - - DB_PASSWORD=${MYSQL_PASSWORD} - - DB_BACKUP_TARGETFOLDER=${DB_BACKUP_TARGETFOLDER} - volumes: + - MYSQL_HOST=db + - MYSQL_DATABASE=${MYSQL_DATABASE} + - MYSQL_USER=${MYSQL_USER} + - MYSQL_PASSWORD=${MYSQL_PASSWORD} + - DESTINATION=/wiki/db_dumps + volumes: - duplicati_data:/data - db_data:/wiki/db_data:ro - app_data:/wiki/app_data:ro - - db-dumps:${DB_BACKUP_TARGETFOLDER} + - db-dumps:/wiki/db_dumps ports: - 8202:8200 restart: unless-stopped diff --git a/docker/scripts/backupdb.sh b/docker/scripts/backupdb.sh deleted file mode 100644 index e69de29..0000000