diff --git a/salt/salt/minion.sls b/salt/salt/minion.sls index 8c6f7f019..d26365485 100644 --- a/salt/salt/minion.sls +++ b/salt/salt/minion.sls @@ -9,6 +9,7 @@ {% set service_start_delay = SALTMINION.salt.minion.service_start_delay %} include: + - salt.python_modules - salt - systemd.reload - repo.client diff --git a/salt/salt/module_packages/docker/certifi-2024.7.4-py3-none-any.whl b/salt/salt/module_packages/docker/certifi-2024.7.4-py3-none-any.whl new file mode 100644 index 000000000..9e412a2d9 Binary files /dev/null and b/salt/salt/module_packages/docker/certifi-2024.7.4-py3-none-any.whl differ diff --git a/salt/salt/module_packages/docker/charset_normalizer-3.3.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl b/salt/salt/module_packages/docker/charset_normalizer-3.3.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl new file mode 100644 index 000000000..19a91a278 Binary files /dev/null and b/salt/salt/module_packages/docker/charset_normalizer-3.3.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl differ diff --git a/salt/salt/module_packages/docker/docker-7.1.0-py3-none-any.whl b/salt/salt/module_packages/docker/docker-7.1.0-py3-none-any.whl new file mode 100644 index 000000000..c324efbd0 Binary files /dev/null and b/salt/salt/module_packages/docker/docker-7.1.0-py3-none-any.whl differ diff --git a/salt/salt/module_packages/docker/idna-3.7-py3-none-any.whl b/salt/salt/module_packages/docker/idna-3.7-py3-none-any.whl new file mode 100644 index 000000000..fa4c95b12 Binary files /dev/null and b/salt/salt/module_packages/docker/idna-3.7-py3-none-any.whl differ diff --git a/salt/salt/module_packages/docker/requests-2.32.3-py3-none-any.whl b/salt/salt/module_packages/docker/requests-2.32.3-py3-none-any.whl new file mode 100644 index 000000000..23662ce7e Binary files /dev/null and b/salt/salt/module_packages/docker/requests-2.32.3-py3-none-any.whl differ diff --git a/salt/salt/module_packages/docker/urllib3-2.2.2-py3-none-any.whl b/salt/salt/module_packages/docker/urllib3-2.2.2-py3-none-any.whl new file mode 100644 index 000000000..61a56086a Binary files /dev/null and b/salt/salt/module_packages/docker/urllib3-2.2.2-py3-none-any.whl differ diff --git a/salt/salt/python_modules.sls b/salt/salt/python_modules.sls new file mode 100644 index 000000000..7e8665b1c --- /dev/null +++ b/salt/salt/python_modules.sls @@ -0,0 +1,12 @@ +docker_module_package: + file.recurse: + - name: /opt/so/conf/salt/modules_packages/docker + - source: salt://salt/module_packages/docker + - clean: True + - makedirs: True + +docker_python_module_install: + cmd.run: + - name: /opt/saltstack/salt/bin/python3.10 -m pip install docker --no-index --find-links=/opt/so/conf/salt/modules_packages/docker/ --upgrade + - onchanges: + - file: docker_module_package diff --git a/setup/files/salt_module_deps/docker/certifi-2022.12.7-py3-none-any.whl b/setup/files/salt_module_deps/docker/certifi-2022.12.7-py3-none-any.whl deleted file mode 100644 index a08305611..000000000 Binary files a/setup/files/salt_module_deps/docker/certifi-2022.12.7-py3-none-any.whl and /dev/null differ diff --git a/setup/files/salt_module_deps/docker/chardet-4.0.0-py2.py3-none-any.whl b/setup/files/salt_module_deps/docker/chardet-4.0.0-py2.py3-none-any.whl deleted file mode 100644 index b83344e8e..000000000 Binary files a/setup/files/salt_module_deps/docker/chardet-4.0.0-py2.py3-none-any.whl and /dev/null differ diff --git a/setup/files/salt_module_deps/docker/charset_normalizer-3.1.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl b/setup/files/salt_module_deps/docker/charset_normalizer-3.1.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl deleted file mode 100644 index 7b57bc716..000000000 Binary files a/setup/files/salt_module_deps/docker/charset_normalizer-3.1.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl and /dev/null differ diff --git a/setup/files/salt_module_deps/docker/docker-5.0.2-py2.py3-none-any.whl b/setup/files/salt_module_deps/docker/docker-5.0.2-py2.py3-none-any.whl deleted file mode 100644 index f1ed95ee1..000000000 Binary files a/setup/files/salt_module_deps/docker/docker-5.0.2-py2.py3-none-any.whl and /dev/null differ diff --git a/setup/files/salt_module_deps/docker/idna-2.10-py2.py3-none-any.whl b/setup/files/salt_module_deps/docker/idna-2.10-py2.py3-none-any.whl deleted file mode 100644 index 41225cb05..000000000 Binary files a/setup/files/salt_module_deps/docker/idna-2.10-py2.py3-none-any.whl and /dev/null differ diff --git a/setup/files/salt_module_deps/docker/requests-2.25.1-py2.py3-none-any.whl b/setup/files/salt_module_deps/docker/requests-2.25.1-py2.py3-none-any.whl deleted file mode 100644 index 8d70e9716..000000000 Binary files a/setup/files/salt_module_deps/docker/requests-2.25.1-py2.py3-none-any.whl and /dev/null differ diff --git a/setup/files/salt_module_deps/docker/urllib3-1.26.15-py2.py3-none-any.whl b/setup/files/salt_module_deps/docker/urllib3-1.26.15-py2.py3-none-any.whl deleted file mode 100644 index ad723d5e1..000000000 Binary files a/setup/files/salt_module_deps/docker/urllib3-1.26.15-py2.py3-none-any.whl and /dev/null differ diff --git a/setup/files/salt_module_deps/docker/websocket_client-1.5.1-py3-none-any.whl b/setup/files/salt_module_deps/docker/websocket_client-1.5.1-py3-none-any.whl deleted file mode 100644 index bd8152d2c..000000000 Binary files a/setup/files/salt_module_deps/docker/websocket_client-1.5.1-py3-none-any.whl and /dev/null differ diff --git a/setup/files/salt_module_deps/pymysql/PyMySQL-1.0.3-py3-none-any.whl b/setup/files/salt_module_deps/pymysql/PyMySQL-1.0.3-py3-none-any.whl deleted file mode 100644 index 0bbd29da0..000000000 Binary files a/setup/files/salt_module_deps/pymysql/PyMySQL-1.0.3-py3-none-any.whl and /dev/null differ diff --git a/setup/so-functions b/setup/so-functions index 4fe5ddebc..f1d96140f 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -1931,7 +1931,7 @@ saltify() { } salt_install_module_deps() { - logCmd "salt-pip install docker --no-index --only-binary=:all: --find-links files/salt_module_deps/docker/" + logCmd "/opt/saltstack/salt/bin/python3.10 -m pip install --no-index --find-links=../salt/salt/module_packages/docker" } salt_patch_x509_v2() {