diff --git a/.dockerignore b/.dockerignore index bc0dc3f..abc3d2c 100644 --- a/.dockerignore +++ b/.dockerignore @@ -3,7 +3,7 @@ node_modules Podmanfile .dockerignore -docker-compose.prod.yml +podman-compose.prod.yml Makefile Caddyfile diff --git a/Makefile b/Makefile index a33393a..fb29878 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,4 @@ -COMPOSE ?= docker compose -f docker-compose.prod.yml --env-file .env.production -PODMAN_COMPOSE ?= podman compose -f podman-compose.prod.yml --env-file .env.production +COMPOSE ?= podman compose -f podman-compose.prod.yml --env-file .env.production # --- Frontend (Tailwind v4 + PenguinUI) ----------------------------- # Uses the Tailwind v4 standalone binary (no Node required at runtime). @@ -14,7 +13,7 @@ else TW_TARGET = tailwindcss-linux-x64 endif -.PHONY: up down restart logs build ps podman-up podman-down podman-restart podman-logs podman-build podman-ps css css-watch tailwind +.PHONY: up down restart logs build ps css css-watch tailwind $(TW): @mkdir -p bin @@ -46,20 +45,3 @@ build: ps: $(COMPOSE) ps - -podman-up: - $(PODMAN_COMPOSE) up -d --build - -podman-down: - $(PODMAN_COMPOSE) down - -podman-restart: podman-down podman-up - -podman-logs: - $(PODMAN_COMPOSE) logs -f --tail=100 - -podman-build: - $(PODMAN_COMPOSE) build --no-cache - -podman-ps: - $(PODMAN_COMPOSE) ps diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml deleted file mode 100644 index 324065b..0000000 --- a/docker-compose.prod.yml +++ /dev/null @@ -1,30 +0,0 @@ -services: - kompress: - container_name: kompress - build: - context: . - dockerfile: Podmanfile - extra_hosts: - - "host.docker.internal:host-gateway" - env_file: - - .env.production - volumes: - - kompress_eshop_data:/usr/app/data - networks: - - kompress_eshop-net - restart: unless-stopped - healthcheck: - test: ["CMD-SHELL", "curl -fsS http://localhost:5150/_ping"] - interval: 30s - timeout: 5s - retries: 3 - start_period: 20s - -networks: - kompress_eshop-net: - external: true - -volumes: - kompress_eshop_data: - external: true - name: kompress_eshop_data