From 466d80c7ef2f06451730d638733f793465268364 Mon Sep 17 00:00:00 2001 From: Thomas Schulze Date: Fri, 30 Jan 2026 13:28:15 +0100 Subject: [PATCH 1/5] update nix shell --- .gitignore | 1 + .yamllint | 1 - shell.nix | 8 +++++--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 5d3ac87..2f32b04 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ .direnv/ .vscode/ +.ansible/ diff --git a/.yamllint b/.yamllint index f5c5fd9..885d7a1 100644 --- a/.yamllint +++ b/.yamllint @@ -1,6 +1,5 @@ --- ignore: | - roles/prometheus/files/generator.yml roles/*/templates/* extends: default diff --git a/shell.nix b/shell.nix index d293d57..7318ed9 100644 --- a/shell.nix +++ b/shell.nix @@ -1,11 +1,13 @@ -{ pkgs ? import { } }: +{ pkgs ? import { + config.allowUnfree = true; +} }: pkgs.mkShell { buildInputs = with pkgs; [ ansible-lint packer - python311 - python311Packages.pip + python313 + python313Packages.pip jq yamllint ]; From f658cf454c6439d210d6fa5e724b7c7a4cb3ed6e Mon Sep 17 00:00:00 2001 From: Thomas Schulze Date: Tue, 7 Apr 2026 16:01:18 +0200 Subject: [PATCH 2/5] simplify AMI name --- baseimage.pkr.hcl | 36 ++++++++++++++++++------------------ webserver.pkr.hcl | 36 ++++++++++++++++++------------------ 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/baseimage.pkr.hcl b/baseimage.pkr.hcl index 4c309c9..b793893 100644 --- a/baseimage.pkr.hcl +++ b/baseimage.pkr.hcl @@ -28,7 +28,7 @@ variable "account_id" { default = "136693071363" } -data "amazon-ami" "debian-amd64-bookworm" { +data "amazon-ami" "debian-amd64" { filters = { name = "debian-12-amd64-*" root-device-type = "ebs" @@ -39,7 +39,7 @@ data "amazon-ami" "debian-amd64-bookworm" { region = "eu-central-1" } -data "amazon-ami" "debian-arm64-bookworm" { +data "amazon-ami" "debian-arm64" { filters = { name = "debian-12-arm64-*" root-device-type = "ebs" @@ -50,22 +50,22 @@ data "amazon-ami" "debian-arm64-bookworm" { region = "eu-central-1" } -# codemonauts-amd64-bookworm-base -source "amazon-ebs" "codemonauts-amd64-bookworm-base" { +# codemonauts-amd64-base +source "amazon-ebs" "codemonauts-amd64-base" { ami_groups = ["all"] - ami_name = "codemonauts-amd64-bookworm-base_${formatdate("YYYY-MM-DD-hh-mm", timestamp())}" + ami_name = "codemonauts-amd64-base_${formatdate("YYYY-MM-DD-hh-mm", timestamp())}" ami_regions = ["eu-west-1"] instance_type = "${var.amd64_instance_type}" region = "eu-central-1" - source_ami = "${data.amazon-ami.debian-amd64-bookworm.id}" + source_ami = "${data.amazon-ami.debian-amd64.id}" ssh_username = "admin" tags = { - Amazon_AMI_Management_Identifier = "codemonauts-amd64-bookworm-base" + Amazon_AMI_Management_Identifier = "codemonauts-amd64-base" } } build { - name = "codemonauts-amd64-bookworm-base" - sources = ["source.amazon-ebs.codemonauts-amd64-bookworm-base"] + name = "codemonauts-amd64-base" + sources = ["source.amazon-ebs.codemonauts-amd64-base"] provisioner "shell" { pause_before = "10s" @@ -82,28 +82,28 @@ build { } post-processor "amazon-ami-management" { - identifier = "codemonauts-amd64-bookworm-base" + identifier = "codemonauts-amd64-base" keep_releases = "3" regions = ["eu-central-1"] } } -# codemonauts-arm64-bookworm-base -source "amazon-ebs" "codemonauts-arm64-bookworm-base" { +# codemonauts-arm64-base +source "amazon-ebs" "codemonauts-arm64-base" { ami_groups = ["all"] - ami_name = "codemonauts-arm64-bookworm-base_${formatdate("YYYY-MM-DD-hh-mm", timestamp())}" + ami_name = "codemonauts-arm64-base_${formatdate("YYYY-MM-DD-hh-mm", timestamp())}" ami_regions = ["eu-west-1"] instance_type = "${var.arm64_instance_type}" region = "eu-central-1" - source_ami = "${data.amazon-ami.debian-arm64-bookworm.id}" + source_ami = "${data.amazon-ami.debian-arm64.id}" ssh_username = "admin" tags = { - Amazon_AMI_Management_Identifier = "codemonauts-arm64-bookworm-base" + Amazon_AMI_Management_Identifier = "codemonauts-arm64-base" } } build { - name = "codemonauts-arm64-bookworm-base" - sources = ["source.amazon-ebs.codemonauts-arm64-bookworm-base"] + name = "codemonauts-arm64-base" + sources = ["source.amazon-ebs.codemonauts-arm64-base"] provisioner "shell" { pause_before = "10s" @@ -120,7 +120,7 @@ build { } post-processor "amazon-ami-management" { - identifier = "codemonauts-arm64-bookworm-base" + identifier = "codemonauts-arm64-base" keep_releases = "3" regions = ["eu-central-1"] } diff --git a/webserver.pkr.hcl b/webserver.pkr.hcl index 1293fd8..700baa2 100644 --- a/webserver.pkr.hcl +++ b/webserver.pkr.hcl @@ -28,7 +28,7 @@ variable "account_id" { default = "136693071363" } -data "amazon-ami" "debian-amd64-bookworm" { +data "amazon-ami" "debian-amd64" { filters = { name = "debian-12-amd64-*" root-device-type = "ebs" @@ -39,7 +39,7 @@ data "amazon-ami" "debian-amd64-bookworm" { region = "eu-central-1" } -data "amazon-ami" "debian-arm64-bookworm" { +data "amazon-ami" "debian-arm64" { filters = { name = "debian-12-arm64-*" root-device-type = "ebs" @@ -50,22 +50,22 @@ data "amazon-ami" "debian-arm64-bookworm" { region = "eu-central-1" } -# codemonauts-amd64-bookworm-webserver-php83 -source "amazon-ebs" "codemonauts-amd64-bookworm-webserver-php83" { +# codemonauts-amd64-webserver-php83 +source "amazon-ebs" "codemonauts-amd64-webserver-php83" { ami_groups = ["all"] - ami_name = "codemonauts-amd64-bookworm-webserver-php83_${formatdate("YYYY-MM-DD-hh-mm", timestamp())}" + ami_name = "codemonauts-amd64-webserver-php83_${formatdate("YYYY-MM-DD-hh-mm", timestamp())}" ami_regions = ["eu-west-1"] instance_type = "${var.amd64_instance_type}" region = "eu-central-1" - source_ami = "${data.amazon-ami.debian-amd64-bookworm.id}" + source_ami = "${data.amazon-ami.debian-amd64.id}" ssh_username = "admin" tags = { - Amazon_AMI_Management_Identifier = "codemonauts-amd64-bookworm-webserver-php83" + Amazon_AMI_Management_Identifier = "codemonauts-amd64-webserver-php83" } } build { - name = "codemonauts-amd64-bookworm-webserver-php83" - sources = ["source.amazon-ebs.codemonauts-amd64-bookworm-webserver-php83"] + name = "codemonauts-amd64-webserver-php83" + sources = ["source.amazon-ebs.codemonauts-amd64-webserver-php83"] provisioner "shell" { pause_before = "10s" @@ -86,28 +86,28 @@ build { } post-processor "amazon-ami-management" { - identifier = "codemonauts-amd64-bookworm-webserver-php83" + identifier = "codemonauts-amd64-bookworm-php83" keep_releases = "3" regions = ["eu-central-1"] } } -# codemonauts-arm64-bookworm-webserver-php83 -source "amazon-ebs" "codemonauts-arm64-bookworm-webserver-php83" { +# codemonauts-arm64-bookworm-php83 +source "amazon-ebs" "codemonauts-arm64-webserver-php83" { ami_groups = ["all"] - ami_name = "codemonauts-arm64-bookworm-webserver-php83_${formatdate("YYYY-MM-DD-hh-mm", timestamp())}" + ami_name = "codemonauts-arm64-webserver-php83_${formatdate("YYYY-MM-DD-hh-mm", timestamp())}" ami_regions = ["eu-west-1"] instance_type = "${var.arm64_instance_type}" region = "eu-central-1" - source_ami = "${data.amazon-ami.debian-arm64-bookworm.id}" + source_ami = "${data.amazon-ami.debian-arm64.id}" ssh_username = "admin" tags = { - Amazon_AMI_Management_Identifier = "codemonauts-arm64-bookworm-webserver-php83" + Amazon_AMI_Management_Identifier = "codemonauts-arm64-webserver-php83" } } build { - name = "codemonauts-arm64-bookworm-webserver-php83" - sources = ["source.amazon-ebs.codemonauts-arm64-bookworm-webserver-php83"] + name = "codemonauts-arm64-webserver-php83" + sources = ["source.amazon-ebs.codemonauts-arm64-webserver-php83"] provisioner "shell" { pause_before = "10s" @@ -128,7 +128,7 @@ build { } post-processor "amazon-ami-management" { - identifier = "codemonauts-arm64-bookworm-webserver-php83" + identifier = "codemonauts-arm64-webserver-php83" keep_releases = "3" regions = ["eu-central-1"] } From e159feff9a4aae5ae2c69437e382a0d852b49567 Mon Sep 17 00:00:00 2001 From: Thomas Schulze Date: Tue, 7 Apr 2026 16:30:21 +0200 Subject: [PATCH 3/5] update GH actions --- .github/workflows/test.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index ee42cd3..a9875fb 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -9,7 +9,7 @@ jobs: name: Validate provisioning steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Setup packer uses: hashicorp/setup-packer@main @@ -32,4 +32,4 @@ jobs: uses: ibiqlik/action-yamllint@v3 - name: Validate ansible playbooks - uses: ansible/ansible-lint-action@main + uses: ansible/ansible-lint@main From 426f19290a3edc91b84a5eab9ab4556685a6112d Mon Sep 17 00:00:00 2001 From: Thomas Schulze Date: Tue, 7 Apr 2026 16:38:33 +0200 Subject: [PATCH 4/5] update GH action --- .github/workflows/test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index a9875fb..432950c 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -9,7 +9,7 @@ jobs: name: Validate provisioning steps: - name: Checkout - uses: actions/checkout@v5 + uses: actions/checkout@v6 - name: Setup packer uses: hashicorp/setup-packer@main From 76255ad784d2da72f890ec604fc046110f278c37 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Jun 2026 06:04:49 +0000 Subject: [PATCH 5/5] Bump actions/checkout from 6 to 7 Bumps [actions/checkout](https://github.com/actions/checkout) from 6 to 7. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v6...v7) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '7' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 432950c..8878c9a 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -9,7 +9,7 @@ jobs: name: Validate provisioning steps: - name: Checkout - uses: actions/checkout@v6 + uses: actions/checkout@v7 - name: Setup packer uses: hashicorp/setup-packer@main