diff --git a/05/dbcheck.php b/05/dbcheck.php new file mode 100644 index 0000000..c970bcb --- /dev/null +++ b/05/dbcheck.php @@ -0,0 +1,15 @@ +query("SELECT DATABASE() AS db_name, NOW() AS server_time"); +$row = $result ? $result->fetch_assoc() : null; + +echo json_encode([ + "status" => "success", + "db" => $row["db_name"] ?? null, + "server_time" => $row["server_time"] ?? null, + "host_env" => getenv("DB_HOST") ?: null, + "port_env" => getenv("DB_PORT") ?: null, + "user_env" => getenv("DB_USER") ?: null, +]); diff --git a/docker-compose.yml b/docker-compose.yml index 06b27c6..687bc34 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,8 +3,8 @@ services: build: . restart: unless-stopped depends_on: - db: - condition: service_healthy + - db + command: sh -c "sleep 25 && apache2-foreground" environment: DB_HOST: db DB_PORT: "3306" @@ -28,12 +28,6 @@ services: - ./01/spbu_db.sql:/docker-entrypoint-initdb.d/01-spbu_db.sql:ro - ./02/webgis2.sql:/docker-entrypoint-initdb.d/02-webgis2.sql:ro - ./05/webgis_uas.sql:/docker-entrypoint-initdb.d/05-webgis_uas.sql:ro - healthcheck: - test: ["CMD-SHELL", "mariadb-admin ping -h 127.0.0.1 -uroot -p$${MARIADB_ROOT_PASSWORD} --silent"] - interval: 10s - timeout: 5s - retries: 15 - start_period: 30s volumes: webgis_db_data: