diff --git a/custom/testing/golden-state-tree/os/ubuntu/pkgs/init.sls b/custom/testing/golden-state-tree/os/ubuntu/pkgs/init.sls index cde7339..0670f1b 100644 --- a/custom/testing/golden-state-tree/os/ubuntu/pkgs/init.sls +++ b/custom/testing/golden-state-tree/os/ubuntu/pkgs/init.sls @@ -28,6 +28,7 @@ include: - pkgs.patch - pkgs.python3 - pkgs.python3-pip + - pkgs.python3-venv - pkgs.rng-tools - pkgs.rsync - pkgs.sed diff --git a/custom/testing/golden-state-tree/pkgs/python3-venv.sls b/custom/testing/golden-state-tree/pkgs/python3-venv.sls new file mode 100644 index 0000000..2d58bb4 --- /dev/null +++ b/custom/testing/golden-state-tree/pkgs/python3-venv.sls @@ -0,0 +1,5 @@ +{%- set pkg_name = 'python3-venv' %} + +python3-venv: + pkg.installed: + - name: {{ pkg_name }} diff --git a/custom/testing/golden-state-tree/python/init.sls b/custom/testing/golden-state-tree/python/init.sls new file mode 100644 index 0000000..b28b04f --- /dev/null +++ b/custom/testing/golden-state-tree/python/init.sls @@ -0,0 +1,3 @@ + + + diff --git a/custom/testing/golden-state-tree/python/map.sls b/custom/testing/golden-state-tree/python/map.sls new file mode 100644 index 0000000..f366cc1 --- /dev/null +++ b/custom/testing/golden-state-tree/python/map.sls @@ -0,0 +1,30 @@ +{% set python = salt['grains.filter_by']({ + 'Arch': { + 'pkgs': [ + ], + }, + 'Debian': { + 'pkgs': [ + ], + }, + 'OpenBSD': { + 'pkgs': [ + ], + }, + 'RedHat': { + 'pkgs': [ + ], + }, + 'Suse': { + 'pkgs': [ + ], + }, + 'FreeBSD': { + 'pkgs': [ + ], + }, + 'Gentoo': { + 'pkgs': [ + ], + }, +}, merge=salt['pillar.get']('python:lookup')) %} diff --git a/custom/testing/systemd-ubuntu-22.04.Dockerfile b/custom/testing/systemd-ubuntu-22.04.Dockerfile index d3b3b9c..228ef98 100644 --- a/custom/testing/systemd-ubuntu-22.04.Dockerfile +++ b/custom/testing/systemd-ubuntu-22.04.Dockerfile @@ -12,7 +12,7 @@ RUN apt update -y \ && echo 'tzdata tzdata/Areas select America' | debconf-set-selections \ && echo 'tzdata tzdata/Zones/America select Phoenix' | debconf-set-selections \ && DEBIAN_FRONTEND="noninteractive" apt install -y \ - tree tar wget xz-utils apt-utils systemd python3 python3-pip git + tree tar wget xz-utils apt-utils systemd python3 python3-pip python3-venv git COPY 01_nodoc /etc/dpkg/dpkg.cfg.d/01_nodoc COPY entrypoint.py entrypoint.py