diff --git a/images/almalinux/8.10/actionsdind/variables.auto.pkrvars.hcl b/images/almalinux/8.10/actionsdind/variables.auto.pkrvars.hcl index 06f2a53..d8a6ed9 100644 --- a/images/almalinux/8.10/actionsdind/variables.auto.pkrvars.hcl +++ b/images/almalinux/8.10/actionsdind/variables.auto.pkrvars.hcl @@ -4,8 +4,6 @@ packages = [ "bash", "consul", "docker-ce-cli", - "jq", - "make", "nodejs", "packer", "terraform", diff --git a/images/almalinux/8.10/base/variables.auto.pkrvars.hcl b/images/almalinux/8.10/base/variables.auto.pkrvars.hcl index aed8309..0ed1359 100644 --- a/images/almalinux/8.10/base/variables.auto.pkrvars.hcl +++ b/images/almalinux/8.10/base/variables.auto.pkrvars.hcl @@ -5,6 +5,11 @@ use_incus = false packages = [ "git", "jq", + "make", + "python3.11", + "python3.11-pip", + "python3.12", + "python3.12-pip", "uv", "wget", ] diff --git a/images/almalinux/8.10/jupyterlab/variables.auto.pkrvars.hcl b/images/almalinux/8.10/jupyterlab/variables.auto.pkrvars.hcl index a27f426..43c181c 100644 --- a/images/almalinux/8.10/jupyterlab/variables.auto.pkrvars.hcl +++ b/images/almalinux/8.10/jupyterlab/variables.auto.pkrvars.hcl @@ -1,13 +1,6 @@ # almalinux/8.10/jupyterlab docker_source = "git.query.consul/unkin/almalinux8-base:latest" deploy_files_from_common = true -packages = [ - "uv", - "python3.11", - "python3.11-pip", - "python3.12", - "python3.12-pip" -] scripts_pre_file_copy = [ "dnf install -y sudo", ] diff --git a/images/almalinux/8.10/rpmbuilder/variables.auto.pkrvars.hcl b/images/almalinux/8.10/rpmbuilder/variables.auto.pkrvars.hcl index 08b3e2e..1952c56 100644 --- a/images/almalinux/8.10/rpmbuilder/variables.auto.pkrvars.hcl +++ b/images/almalinux/8.10/rpmbuilder/variables.auto.pkrvars.hcl @@ -19,7 +19,6 @@ packages = [ "intltool", "jna", "ltrace", - "make", "nfpm", "patchutils", "perl-Fedora-VSP", diff --git a/images/almalinux/9.5/actionsdind/variables.auto.pkrvars.hcl b/images/almalinux/9.5/actionsdind/variables.auto.pkrvars.hcl index 46e693e..9d9ca73 100644 --- a/images/almalinux/9.5/actionsdind/variables.auto.pkrvars.hcl +++ b/images/almalinux/9.5/actionsdind/variables.auto.pkrvars.hcl @@ -4,8 +4,6 @@ packages = [ "bash", "consul", "docker-ce-cli", - "jq", - "make", "nodejs", "packer", "terraform", diff --git a/images/almalinux/9.5/base/variables.auto.pkrvars.hcl b/images/almalinux/9.5/base/variables.auto.pkrvars.hcl index a12f7d6..7178c73 100644 --- a/images/almalinux/9.5/base/variables.auto.pkrvars.hcl +++ b/images/almalinux/9.5/base/variables.auto.pkrvars.hcl @@ -5,6 +5,11 @@ use_incus = false packages = [ "git", "jq", + "make", + "python3.11", + "python3.11-pip", + "python3.12", + "python3.12-pip", "uv", "wget", ] diff --git a/images/almalinux/9.5/jupyterlab/variables.auto.pkrvars.hcl b/images/almalinux/9.5/jupyterlab/variables.auto.pkrvars.hcl index 154471f..04cb7eb 100644 --- a/images/almalinux/9.5/jupyterlab/variables.auto.pkrvars.hcl +++ b/images/almalinux/9.5/jupyterlab/variables.auto.pkrvars.hcl @@ -1,13 +1,6 @@ # almalinux/9.5/jupyterlab deploy_files_from_common = true docker_source = "git.query.consul/unkin/almalinux9-base:latest" -packages = [ - "uv", - "python3.11", - "python3.11-pip", - "python3.12", - "python3.12-pip" -] scripts_pre_file_copy = [ "dnf install -y sudo", ] diff --git a/images/almalinux/9.5/rpmbuilder/variables.auto.pkrvars.hcl b/images/almalinux/9.5/rpmbuilder/variables.auto.pkrvars.hcl index 943b555..10b4dc0 100644 --- a/images/almalinux/9.5/rpmbuilder/variables.auto.pkrvars.hcl +++ b/images/almalinux/9.5/rpmbuilder/variables.auto.pkrvars.hcl @@ -19,7 +19,6 @@ packages = [ "intltool", "jna", "ltrace", - "make", "nfpm", "patchutils", "perl-Fedora-VSP",