Fixing nassella-in-production bugs.

This commit is contained in:
2026-07-15 15:18:34 -07:00
parent 321578a74a
commit b492ff208f
6 changed files with 24 additions and 8 deletions

View File

@@ -19,6 +19,12 @@ TERRAFORM_ENV := production
config_dir := ./config/
apps_config := $(config_dir)apps.config
BUTANE := butane -d ${PWD}
ifeq ($(shell command -v docker >/dev/null 2>&1 && echo yes),yes)
BUTANE := docker run --rm --volume ${PWD}:/pwd --workdir /pwd -i quay.io/coreos/butane:latest -d /pwd
endif
IMAGE_DEPS :=
COMPOSE_ENVS := $(shell if [ -d app/ ]; then find app/ -type f -name '.compose-env'; fi)
@@ -84,7 +90,7 @@ restic-scheduled-snapshot.sh \
app/.env \
$(config_dir)ssh-keys \
app.tar.gz
cat cl.yaml | docker run --rm --volume $(config_dir)/ssh-keys:/pwd/ssh-keys --volume ${PWD}:/pwd --workdir /pwd -i quay.io/coreos/butane:latest -d /pwd > ignition.json
cat cl.yaml | $(BUTANE) > ignition.json
generated.tfvars: $(apps_config) make-generated.sh
./make-generated.sh $(apps_config) > generated.tfvars