diff --git a/.gitignore b/.gitignore index a2566a3..79c76b5 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ env-searxng .*.env nextcloud/db.env nextcloud/nextcloud.env +kodokanjudoeste/import/ diff --git a/kodokanjudoeste/docker-compose.yaml b/kodokanjudoeste/docker-compose.yaml index 51069bb..69fd923 100644 --- a/kodokanjudoeste/docker-compose.yaml +++ b/kodokanjudoeste/docker-compose.yaml @@ -9,16 +9,34 @@ services: - .db.env - .proxy.env - .wordpress.env + volumes: + - data:/var/www/html + healthcheck: + test: "test \"$(curl -Lso /dev/null -w''%{http_code}'' http://localhost:80)\" = \"200\"" + start_period: 5s + interval: 60s + timeout: 10s + retries: 3 depends_on: - - db + db: + condition: service_healthy db: - image: mariadb:11.6.2-ubi9 - command: '--default-authentication-plugin=mysql_native_password' + image: mysql:8.4-oracle restart: unless-stopped + healthcheck: + test: "mysql $$MYSQL_DATABASE -u$$MYSQL_USER -p$$MYSQL_PASSWORD -e 'SELECT 1;'" + start_period: 10s + interval: 10s + timeout: 5s + retries: 3 networks: - internal env_file: - .db.env + volumes: + # Enable ONLY for importing the db again + # - ./import:/docker-entrypoint-initdb.d:ro + - db:/var/lib/mysql networks: proxy: