diff --git a/setuper/setup.sh b/setuper/setup.sh index bd2b819..01949c2 100644 --- a/setuper/setup.sh +++ b/setuper/setup.sh @@ -104,7 +104,6 @@ SHEOF chmod +x Packmate_stuff/update_db_config.sh # docker-compose.yml (minimal) cat > docker-compose.yml <<'DCEOF' -version: '3.8' services: packmate: env_file: @@ -175,7 +174,6 @@ POSTGRES_PASSWORD=farmpassword123 POSTGRES_DB=farm ENVEOF cat > docker-compose.yml <<'DCEOF' -version: '3.8' services: farm: image: ghcr.io/ilyastar9999/moded_distructive_farm:latest @@ -190,8 +188,10 @@ services: - "3333:8000" postgres: image: postgres:18 - env_file: - - .env + environment: + - POSTGRES_USER=farm + - POSTGRES_PASSWORD=farmpassword123 + - POSTGRES_DB=farm healthcheck: test: ["CMD-SHELL", "pg_isready -U farm -d farm"] interval: 10s @@ -230,10 +230,9 @@ FIREGEX_PORT=5000 ENVEOF if [ ! -f "docker-compose.yml" ]; then cat > docker-compose.yml <<'DCEOF' -version: '3.8' services: firegex: - build: . + image: ghcr.io/pwnzer0tt1/firegex:latest env_file: - .env container_name: firegex-app @@ -243,7 +242,7 @@ services: DCEOF fi echo "Starting Firegex containers..." - docker compose up -d --no-build + docker compose up -d --no-build echo "Registering Firegex with controller..." call_api "/services" "POST" "{\"name\": \"firegex\", \"path\": \"$firegex_dir\", \"git_url\": \"https://github.com/Pwnzer0tt1/firegex.git\"}" cd "$SCRIPT_DIR"