Switch to using images in registry

salt/master/init.sls

@@ -12,7 +12,8 @@
 #
 #    You should have received a copy of the GNU General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
+{% set VERSION = salt['pillar.get']('static:soversion', '1.1.4') %}
+{% set MASTER = salt['grains.get']('master') %}
 {% set masterproxy = salt['pillar.get']('static:masterupdate', '0') %}
 
 {% if masterproxy == 1 %}
@@ -55,16 +56,10 @@ acngcopyconf:
     - name: /opt/so/conf/aptcacher-ng/etc/acng.conf
     - source: salt://master/files/acng/acng.conf
 
-so-acngimage:
- cmd.run:
-   - name: docker pull --disable-content-trust=false docker.io/soshybridhunter/so-acng:HH1.1.0
-
 # Install the apt-cacher-ng container
 so-aptcacherng:
   docker_container.running:
-    - require:
-      - so-acngimage
-    - image: docker.io/soshybridhunter/so-acng:HH1.1.0
+    - image: {{ MASTER }}:5000/soshybridhunter/so-acng:HH{{ VERSION }}
     - hostname: so-acng
     - port_bindings:
       - 0.0.0.0:3142:3142