use Salt dev version

janniswarnat · Jan 20, 2023 · 9a6cf5f · 9a6cf5f
1 parent 727af2c
commit 9a6cf5f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/build_master/Dockerfile b/build_master/Dockerfile
@@ -38,10 +38,12 @@ VOLUME /etc/salt/pki/
 
 RUN pip3 install --no-cache-dir python-ldap
 
-RUN USE_STATIC_REQUIREMENTS=1 pip3 install --no-cache-dir salt=="3005.1"
-RUN su - salt -c 'salt-run salt.cmd tls.create_self_signed_cert'
-
 WORKDIR /github.com
+RUN git clone https://github.com/saltstack/salt
+#RUN USE_STATIC_REQUIREMENTS=1 pip3 install --no-cache-dir salt=="3005.1"
+RUN pip3 install --no-cache-dir pyzmq PyYAML pycrypto msgpack jinja2 psutil tornado
+RUN pip3 install -e ./salt
+RUN su - salt -c 'salt-run salt.cmd tls.create_self_signed_cert'
 
 RUN git clone https://github.com/theforeman/smart-proxy.git -b 3.5-stable
 RUN git clone https://github.com/theforeman/smart_proxy_salt.git # -b 5.0.0 = master since 2022-02-14

diff --git a/etc_minion/salt/minion b/etc_minion/salt/minion
@@ -13,7 +13,7 @@
 
 # Set the location of the salt master server. If the master server cannot be
 # resolved, then the minion will fail to start.
-master: salt
+master: familie-warnat.de
 #master: host.docker.internal
 
 # Set http proxy information for the minion when doing requests