From e81d44988ffc3be3708091868fb24cd83dadc2e9 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 3 Aug 2026 15:02:20 +0100 Subject: [PATCH 1/6] network --- docker/compose.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/docker/compose.yml b/docker/compose.yml index 8fb1486..1bd005a 100644 --- a/docker/compose.yml +++ b/docker/compose.yml @@ -76,4 +76,7 @@ services: networks: lista-zakupow_network: - driver: bridge \ No newline at end of file + driver: bridge + ipam: + config: + - subnet: 172.30.250.0/24 -- 2.43.0 From f4afe304f0fd5c7c6a286807e78de1c15d1f4d0c Mon Sep 17 00:00:00 2001 From: root Date: Mon, 3 Aug 2026 15:05:06 +0100 Subject: [PATCH 2/6] network --- docker/compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/compose.yml b/docker/compose.yml index 1bd005a..197d608 100644 --- a/docker/compose.yml +++ b/docker/compose.yml @@ -79,4 +79,4 @@ networks: driver: bridge ipam: config: - - subnet: 172.30.250.0/24 + - subnet: 192.168.217.0/24 -- 2.43.0 From 272115167ae675050230240df060f1e56c5d58c2 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 3 Aug 2026 15:05:39 +0100 Subject: [PATCH 3/6] network --- docker/compose.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/docker/compose.yml b/docker/compose.yml index 197d608..ea52a53 100644 --- a/docker/compose.yml +++ b/docker/compose.yml @@ -77,6 +77,3 @@ services: networks: lista-zakupow_network: driver: bridge - ipam: - config: - - subnet: 192.168.217.0/24 -- 2.43.0 From 1517657e14c33987455f8f14eb5204fe1a76b522 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 3 Aug 2026 15:15:12 +0100 Subject: [PATCH 4/6] fix in deploy --- deploy_docker.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/deploy_docker.sh b/deploy_docker.sh index 1ba2c61..419c964 100644 --- a/deploy_docker.sh +++ b/deploy_docker.sh @@ -78,9 +78,9 @@ if [[ "$ACTION" == "restart" ]]; then echo "Odtwarzam kontenery bez przebudowy obrazu..." if [[ "$PROFILE" == "sqlite" ]]; then - docker compose -f "$COMPOSE_FILE" up -d --force-recreate + docker compose -f "$COMPOSE_FILE" --env-file .env up -d --force-recreate else - DB_ENGINE="$PROFILE" docker compose -f "$COMPOSE_FILE" --profile "$PROFILE" up -d --force-recreate + DB_ENGINE="$PROFILE" docker compose --env-file .env -f "$COMPOSE_FILE" --profile "$PROFILE" up -d --force-recreate fi echo "Gotowe! Wersja aplikacji: $(cat version.txt)" @@ -91,7 +91,7 @@ echo "Zatrzymuję kontenery aplikacji i bazy..." if [[ "$PROFILE" == "sqlite" ]]; then docker compose -f "$COMPOSE_FILE" stop else - DB_ENGINE="$PROFILE" docker compose -f "$COMPOSE_FILE" --profile "$PROFILE" stop + DB_ENGINE="$PROFILE" docker compose --env-file .env -f "$COMPOSE_FILE" --profile "$PROFILE" stop fi echo "Pobieram najnowszy kod z repozytorium..." @@ -99,9 +99,9 @@ git pull echo "Uruchamiam kontenery z przebudową obrazu..." if [[ "$PROFILE" == "sqlite" ]]; then - docker compose -f "$COMPOSE_FILE" up -d --build + docker compose --env-file .env -f "$COMPOSE_FILE" up -d --build else - DB_ENGINE="$PROFILE" docker compose -f "$COMPOSE_FILE" --profile "$PROFILE" up -d --build + DB_ENGINE="$PROFILE" docker compose --env-file .env -f "$COMPOSE_FILE" --profile "$PROFILE" up -d --build fi -echo "Gotowe! Wersja aplikacji: $(cat version.txt)" \ No newline at end of file +echo "Gotowe! Wersja aplikacji: $(cat version.txt)" -- 2.43.0 From 8a0f139d6043c074478345b5303c42b60c113388 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 3 Aug 2026 15:19:13 +0100 Subject: [PATCH 5/6] fix in deploy --- docker/compose.yml | 80 +++++++++++++++++++++++++++++++++------------- 1 file changed, 57 insertions(+), 23 deletions(-) diff --git a/docker/compose.yml b/docker/compose.yml index ea52a53..f873bab 100644 --- a/docker/compose.yml +++ b/docker/compose.yml @@ -4,75 +4,109 @@ services: context: .. dockerfile: docker/Dockerfile.debian-stable-slim container_name: lista-zakupow-app + + env_file: + - ../.env + expose: - "${APP_PORT:-8000}" + healthcheck: test: - [ - "CMD", - "python", - "-c", - "import urllib.request; import sys; req = urllib.request.Request('http://localhost:${APP_PORT:-8000}/healthcheck', headers={'X-Internal-Check': '${HEALTHCHECK_TOKEN}'}); sys.exit(0) if urllib.request.urlopen(req).getcode() == 200 else sys.exit(1)", - ] + - CMD + - python + - -c + - >- + import os, sys, urllib.request; + port = os.environ["APP_PORT"]; + token = os.environ["HEALTHCHECK_TOKEN"]; + req = urllib.request.Request( + "http://127.0.0.1:" + port + "/healthcheck", + headers={"X-Internal-Check": token}); + response = urllib.request.urlopen(req, timeout=5); + sys.exit(0 if response.status == 200 else 1) interval: 30s timeout: 10s retries: 3 - start_period: 10s - env_file: - - ../.env + start_period: 20s + volumes: - ../:/app - ../uploads:/app/uploads - ../instance:/app/instance + networks: - lista-zakupow_network + restart: unless-stopped varnish: - image: varnish:latest + image: varnish:9.0 container_name: lista-zakupow-varnish + depends_on: app: condition: service_healthy + ports: - "${APP_PORT:-8000}:80" + volumes: - ../deploy/varnish/default.vcl:/etc/varnish/default.vcl:ro + environment: - - VARNISH_SIZE=256m + VARNISH_SIZE: 256m + networks: - lista-zakupow_network + restart: unless-stopped mysql: image: mysql:8 container_name: lista-zakupow-mysql-db + + env_file: + - ../.env + environment: - MYSQL_DATABASE: ${DB_NAME} - MYSQL_USER: ${DB_USER} - MYSQL_PASSWORD: ${DB_PASSWORD} - MYSQL_ROOT_PASSWORD: 89o38kUX5T4C + MYSQL_DATABASE: "${DB_NAME}" + MYSQL_USER: "${DB_USER}" + MYSQL_PASSWORD: "${DB_PASSWORD}" + MYSQL_ROOT_PASSWORD: "${MYSQL_ROOT_PASSWORD}" + volumes: - ../db/mysql:/var/lib/mysql - restart: unless-stopped + networks: - lista-zakupow_network - profiles: ["mysql"] + + restart: unless-stopped + profiles: + - mysql pgsql: image: postgres:18 container_name: lista-zakupow-pgsql + + env_file: + - ../.env + environment: - POSTGRES_DB: ${DB_NAME} - POSTGRES_USER: ${DB_USER} - POSTGRES_PASSWORD: ${DB_PASSWORD} - PGDATA: /var/lib/postgresql + POSTGRES_DB: "${DB_NAME}" + POSTGRES_USER: "${DB_USER}" + POSTGRES_PASSWORD: "${DB_PASSWORD}" + PGDATA: /var/lib/postgresql/data + volumes: - - ../db/pgsql:/var/lib/postgresql + - ../db/pgsql:/var/lib/postgresql/data + networks: - lista-zakupow_network + restart: unless-stopped - profiles: ["pgsql"] + profiles: + - pgsql networks: lista-zakupow_network: -- 2.43.0 From 74ff69f0bbb8e63862b2ed3fd19cf406485c1192 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 3 Aug 2026 15:21:37 +0100 Subject: [PATCH 6/6] mysql pass --- docker/compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/compose.yml b/docker/compose.yml index f873bab..8b8640b 100644 --- a/docker/compose.yml +++ b/docker/compose.yml @@ -74,6 +74,7 @@ services: MYSQL_USER: "${DB_USER}" MYSQL_PASSWORD: "${DB_PASSWORD}" MYSQL_ROOT_PASSWORD: "${MYSQL_ROOT_PASSWORD}" + MYSQL_ROOT_PASSWORD="5lWuo5sMFXOZmSvx8jbmHj19" volumes: - ../db/mysql:/var/lib/mysql -- 2.43.0