From 4967203be1769ba582c844739571cc59419860c6 Mon Sep 17 00:00:00 2001 From: MrMeeb Date: Sun, 8 Feb 2026 14:45:07 +0000 Subject: [PATCH] Try different method so we get new lines --- ignition/base-install-docker.bu | 3 ++- ignition/base-install-docker.ign | 2 +- ignition/base-install-supporting-services.bu | 11 +++++------ ignition/base-install-supporting-services.ign | 10 +++------- 4 files changed, 11 insertions(+), 15 deletions(-) diff --git a/ignition/base-install-docker.bu b/ignition/base-install-docker.bu index 2739f4d..5f5cec6 100644 --- a/ignition/base-install-docker.bu +++ b/ignition/base-install-docker.bu @@ -11,7 +11,8 @@ storage: files: - path: /var/home/core/.bashrc append: - - inline: "alias dc='docker compose -f /var/docker/docker-compose.yml'" + - inline: | + alias dc='docker compose -f /var/docker/docker-compose.yml' directories: - path: /var/docker user: diff --git a/ignition/base-install-docker.ign b/ignition/base-install-docker.ign index e91d783..cbd1f59 100644 --- a/ignition/base-install-docker.ign +++ b/ignition/base-install-docker.ign @@ -30,7 +30,7 @@ "append": [ { "compression": "", - "source": "data:,alias%20dc%3D'docker%20compose%20-f%20%2Fvar%2Fdocker%2Fdocker-compose.yml'" + "source": "data:,alias%20dc%3D'docker%20compose%20-f%20%2Fvar%2Fdocker%2Fdocker-compose.yml'%0A" } ] } diff --git a/ignition/base-install-supporting-services.bu b/ignition/base-install-supporting-services.bu index cc64af7..0664901 100644 --- a/ignition/base-install-supporting-services.bu +++ b/ignition/base-install-supporting-services.bu @@ -42,11 +42,10 @@ storage: contents: source: https://git.mrmeeb.stream/mrmeeb-labs/supporting-services/raw/branch/main/.env - path: /var/home/core/.bashrc - append: - # Add step alias - - inline: "alias step='docker run --rm -v /var/home/core:/home/step -e STEPPATH=/home/step/.step smallstep/step-cli step'" - # Add sops alias - - inline: "alias sops='docker run --rm -it -v /var/home/core:/root -v /var/docker:/var/docker ghcr.io/getsops/sops:v3.11.0'" + append: + - inline: | + alias step='docker run --rm -v /var/home/core:/home/step -e STEPPATH=/home/step/.step smallstep/step-cli step' + alias sops='docker run --rm -it -v /var/home/core:/root -v /var/docker:/var/docker ghcr.io/getsops/sops:v3.11.0' systemd: units: @@ -64,7 +63,7 @@ systemd: [Service] Type=oneshot RemainAfterExit=yes - ExecStart=/usr/bin/docker run --rm -v ${HOME}:/home/step -e STEPPATH=/home/step/.step smallstep/step-cli step ca bootstrap --team mtls --team-url "https://mrmeeb.co.uk/step/<>" + ExecStart=/usr/bin/docker run --rm -v /var/home/core:/home/step -e STEPPATH=/home/step/.step smallstep/step-cli step ca bootstrap --team mtls --team-url "https://mrmeeb.co.uk/step/<>" ExecStart=/usr/bin/touch /var/lib/%N.stamp [Install] diff --git a/ignition/base-install-supporting-services.ign b/ignition/base-install-supporting-services.ign index 1842733..aee9ba9 100644 --- a/ignition/base-install-supporting-services.ign +++ b/ignition/base-install-supporting-services.ign @@ -64,12 +64,8 @@ "path": "/var/home/core/.bashrc", "append": [ { - "compression": "", - "source": "data:,alias%20step%3D'docker%20run%20--rm%20-v%20%2Fvar%2Fhome%2Fcore%3A%2Fhome%2Fstep%20-e%20STEPPATH%3D%2Fhome%2Fstep%2F.step%20smallstep%2Fstep-cli%20step'" - }, - { - "compression": "", - "source": "data:,alias%20sops%3D'docker%20run%20--rm%20-it%20-v%20%2Fvar%2Fhome%2Fcore%3A%2Froot%20-v%20%2Fvar%2Fdocker%3A%2Fvar%2Fdocker%20ghcr.io%2Fgetsops%2Fsops%3Av3.11.0'" + "compression": "gzip", + "source": "data:;base64,H4sIAAAAAAAC/2yNscrDMAyE9zyFtky2/vBvhgwdCh0DzQsYVySmdhVk189f7BTSIctxOkn32eBtgpRpG/sHuycJyPsFSkkEVQCLFVw5EjoWMrut16AI7vN1mi7zbTxi1G2Zog2hzVWUC74h+u6L4y2d4Hw+Qwrzke8/5sfDsjrRnnGhXHuxiin/ehj0X999AgAA///HAo1T4AAAAA==" } ] } @@ -78,7 +74,7 @@ "systemd": { "units": [ { - "contents": "[Unit]\nDescription=Bootstrap step-ca\nWants=network-online.target\nAfter=rpm-ostree-install-docker-ce.service\nBefore=zincati.service\nConditionPathExists=!/var/lib/%N.stamp\n\n[Service]\nType=oneshot\nRemainAfterExit=yes\nExecStart=/usr/bin/docker run --rm -v ${HOME}:/home/step -e STEPPATH=/home/step/.step smallstep/step-cli step ca bootstrap --team mtls --team-url \"https://mrmeeb.co.uk/step/\u003c\u003e\"\nExecStart=/usr/bin/touch /var/lib/%N.stamp\n\n[Install]\nWantedBy=multi-user.target", + "contents": "[Unit]\nDescription=Bootstrap step-ca\nWants=network-online.target\nAfter=rpm-ostree-install-docker-ce.service\nBefore=zincati.service\nConditionPathExists=!/var/lib/%N.stamp\n\n[Service]\nType=oneshot\nRemainAfterExit=yes\nExecStart=/usr/bin/docker run --rm -v /var/home/core:/home/step -e STEPPATH=/home/step/.step smallstep/step-cli step ca bootstrap --team mtls --team-url \"https://mrmeeb.co.uk/step/\u003c\u003e\"\nExecStart=/usr/bin/touch /var/lib/%N.stamp\n\n[Install]\nWantedBy=multi-user.target", "enabled": true, "name": "bootstrap-step-ca.service" }