From ce5a322b216bc6105e7397378fd658fe978532c4 Mon Sep 17 00:00:00 2001 From: Ben Vincent Date: Tue, 6 Jan 2026 21:40:51 +1100 Subject: [PATCH] feat: build artifactapi container - update base/rpmbuilder/actionsdind containers - build artifactapi container - fix actionsdind list formatting --- .../9.6/actionsdind/variables.auto.pkrvars.hcl | 2 +- images/almalinux/9.6/actionsdind/version | 2 +- images/almalinux/9.6/artifactapi/builds | 1 + .../9.6/artifactapi/variables.auto.pkrvars.hcl | 18 ++++++++++++++++++ images/almalinux/9.6/artifactapi/version | 1 + images/almalinux/9.6/base/version | 2 +- images/almalinux/9.6/rpmbuilder/version | 2 +- 7 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 images/almalinux/9.6/artifactapi/builds create mode 100644 images/almalinux/9.6/artifactapi/variables.auto.pkrvars.hcl create mode 100644 images/almalinux/9.6/artifactapi/version diff --git a/images/almalinux/9.6/actionsdind/variables.auto.pkrvars.hcl b/images/almalinux/9.6/actionsdind/variables.auto.pkrvars.hcl index b3a1e2c..34ea06f 100644 --- a/images/almalinux/9.6/actionsdind/variables.auto.pkrvars.hcl +++ b/images/almalinux/9.6/actionsdind/variables.auto.pkrvars.hcl @@ -9,7 +9,7 @@ packages = [ "incus-client", "incus-tools", "nodejs", - "opentofu" + "opentofu", "packer", "terragrunt", "unzip", diff --git a/images/almalinux/9.6/actionsdind/version b/images/almalinux/9.6/actionsdind/version index 9456ec9..94d087a 100644 --- a/images/almalinux/9.6/actionsdind/version +++ b/images/almalinux/9.6/actionsdind/version @@ -1 +1 @@ -20251017 +20260106 diff --git a/images/almalinux/9.6/artifactapi/builds b/images/almalinux/9.6/artifactapi/builds new file mode 100644 index 0000000..bdb9670 --- /dev/null +++ b/images/almalinux/9.6/artifactapi/builds @@ -0,0 +1 @@ +docker diff --git a/images/almalinux/9.6/artifactapi/variables.auto.pkrvars.hcl b/images/almalinux/9.6/artifactapi/variables.auto.pkrvars.hcl new file mode 100644 index 0000000..e46c301 --- /dev/null +++ b/images/almalinux/9.6/artifactapi/variables.auto.pkrvars.hcl @@ -0,0 +1,18 @@ +# almalinux/9.6/rpmbuilder +docker_source = "git.unkin.net/unkin/almalinux9-base:latest" +scripts_post_packages = [ + "git clone https://git.unkin.net/unkin/artifactapi.git /app/artifactapi && uv build --wheel /app/artifactapi", + "uv tool install uvx --from /app/artifactapi/dist/*.whl artifactapi", + "useradd -r -s /bin/sh appuser && chown -R appuser:appuser /app" +] +scripts_final = [ + "dnf clean all", + "rm -rf /var/cache/dnf" +] +docker_changes = [ + "EXPOSE 8000", + "HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 CMD curl -f http://localhost:8000/health || exit 1", + "USER appuser", + "WORKDIR /app", + "CMD [\"artifactapi\"]" +] diff --git a/images/almalinux/9.6/artifactapi/version b/images/almalinux/9.6/artifactapi/version new file mode 100644 index 0000000..94d087a --- /dev/null +++ b/images/almalinux/9.6/artifactapi/version @@ -0,0 +1 @@ +20260106 diff --git a/images/almalinux/9.6/base/version b/images/almalinux/9.6/base/version index 9456ec9..94d087a 100644 --- a/images/almalinux/9.6/base/version +++ b/images/almalinux/9.6/base/version @@ -1 +1 @@ -20251017 +20260106 diff --git a/images/almalinux/9.6/rpmbuilder/version b/images/almalinux/9.6/rpmbuilder/version index 9456ec9..94d087a 100644 --- a/images/almalinux/9.6/rpmbuilder/version +++ b/images/almalinux/9.6/rpmbuilder/version @@ -1 +1 @@ -20251017 +20260106