twooey
e4ee584e86
- PricingEngine::round_to_99(): ceil($price) - 0.01 undershoots whenever $price's cents are already .99 or higher — an exact integer (ceil() equals floor(), landing a full cent below $price) or, more subtly, any fractional price above X.99 itself (a division result, not something pre-rounded to 2 decimals, e.g. 20.995 -> old formula gave 20.99, below the input). Rewritten as floor()+0.99, bumped by 1 if still under $price. Verified against 8 cases including both boundary classes: every result now >= its input. - CoverSync::attach_cover(): wp_generate_attachment_metadata()'s return value was never checked. Assumed it'd return empty on failure — verified directly it does NOT: fed it 2000 bytes of garbage and got back ['filesize' => 2000], no width/height, since GD/Imagick couldn't decode it. Old code would report "attached" for a degraded image with no dimensions/srcset. Now checks for width+height specifically, and cleans up the orphaned attachment on failure so a re-run retries the product. Verified both the corrupt-image rejection (no orphan left, no thumbnail set) and that a real image still attaches normally. - Makefile: the per-invocation .env.$(ENV).compose file (holds every API key and both DB passwords, stripped of DB_PASSWORD/DB_ROOT_PASSWORD only) was never cleaned up, left at default 644 in the repo root after every `make` command. Now chmod 600 on creation and removed at the end of every target, preserving the underlying command's exit code through the cleanup. Verified both the happy path (file gone after, exit 0) and the failure path (bad ENV: file still cleaned up, real exit code still propagates through make). - docker-compose.yml: added a healthcheck to the wordpress service (bash's /dev/tcp against php-fpm's port 9000 — no HTTP endpoint to hit directly, and no `nc` in this image; verified it correctly succeeds once php-fpm is listening and fails against a closed port) and switched cron's and caddy's depends_on (across all three env overlays) from bare container-started to condition: service_healthy. Previously both could start against a wordpress container that had started but wasn't actually ready yet. Verified via a full down/up cycle: db+redis healthy, then wordpress starts and becomes healthy, only then do cron and caddy start. - .env.dev/.env.staging/.env.production chmod'd 600 (were 644) — same plaintext-credential content as secrets/<env>/, which is already 700/644 at the directory/file level respectively for a different reason (container UID readability); these have no such constraint, only the host CLI reads them. Also removed a stray .env.staging.compose left over from before the Makefile fix above existed. Noted the convention in .env.example so newly created env files follow it too.
49 lines
2.2 KiB
Makefile
49 lines
2.2 KiB
Makefile
ENV ?= dev
|
|
export ENVIRONMENT = $(ENV)
|
|
# DB_PASSWORD/DB_ROOT_PASSWORD are stripped from what Compose loads — they
|
|
# only flow through secrets/ now, and Compose warns "variable not set" on
|
|
# any $-shaped value in --env-file even when nothing consumes it. Rewritten
|
|
# fresh on every `make` invocation, so it can't drift from .env.$(ENV).
|
|
# chmod 600 (not the 644 elsewhere in deploy/ — those get read by containers
|
|
# under a different UID; this one is only ever read by the `docker compose`
|
|
# CLI on the host, as $(ENV) invokes it, so there's no reason it needs to be
|
|
# world-readable) — and every target below removes it on the way out (see
|
|
# each recipe's `; rc=$$?; rm -f ...; exit $$rc`) rather than leaving a
|
|
# plaintext copy of every API key and both DB passwords sitting in the repo
|
|
# root after every `make` invocation. Make has no built-in "on exit"
|
|
# hook across arbitrary targets, so this is repeated per-target rather than
|
|
# centralized; `$$rc`/`exit $$rc` preserves the underlying command's exit
|
|
# code through the cleanup so a real failure (e.g. deploy.sh erroring) still
|
|
# fails the `make` invocation.
|
|
COMPOSE_ENV_FILE := .env.$(ENV).compose
|
|
$(shell grep -Ev '^(DB_PASSWORD|DB_ROOT_PASSWORD)=' .env.$(ENV) > $(COMPOSE_ENV_FILE) 2>/dev/null; chmod 600 $(COMPOSE_ENV_FILE) 2>/dev/null)
|
|
COMPOSE = docker compose -p bookstore-$(ENV) -f docker-compose.yml -f docker-compose.$(ENV).yml --env-file $(COMPOSE_ENV_FILE)
|
|
|
|
.PHONY: up down ps logs shell wp deploy backup
|
|
|
|
up:
|
|
$(COMPOSE) up -d --build; rc=$$?; rm -f $(COMPOSE_ENV_FILE); exit $$rc
|
|
|
|
down:
|
|
$(COMPOSE) down; rc=$$?; rm -f $(COMPOSE_ENV_FILE); exit $$rc
|
|
|
|
ps:
|
|
$(COMPOSE) ps; rc=$$?; rm -f $(COMPOSE_ENV_FILE); exit $$rc
|
|
|
|
logs:
|
|
$(COMPOSE) logs -f; rc=$$?; rm -f $(COMPOSE_ENV_FILE); exit $$rc
|
|
|
|
# add -u root yourself for one-off root debugging (installing a package, etc.)
|
|
shell:
|
|
$(COMPOSE) exec -u www-data wordpress bash; rc=$$?; rm -f $(COMPOSE_ENV_FILE); exit $$rc
|
|
|
|
# make wp ENV=staging ARGS="plugin list"
|
|
wp:
|
|
$(COMPOSE) exec -u www-data wordpress wp $(ARGS); rc=$$?; rm -f $(COMPOSE_ENV_FILE); exit $$rc
|
|
|
|
deploy:
|
|
./deploy/deploy.sh $(ENV); rc=$$?; rm -f $(COMPOSE_ENV_FILE); exit $$rc
|
|
|
|
backup:
|
|
./deploy/backup.sh $(ENV); rc=$$?; rm -f $(COMPOSE_ENV_FILE); exit $$rc
|