diff --git a/salt/common/tools/sbin/so-docker-refresh b/salt/common/tools/sbin/so-docker-refresh index ace1e9554..770d9f241 100755 --- a/salt/common/tools/sbin/so-docker-refresh +++ b/salt/common/tools/sbin/so-docker-refresh @@ -76,6 +76,7 @@ if [ $MANAGERCHECK != 'so-helix' ]; then "so-kibana:$VERSION" \ "so-kratos:$VERSION" \ "so-logstash:$VERSION" \ + "so-minio:$VERSION" \ "so-mysql:$VERSION" \ "so-nginx:$VERSION" \ "so-pcaptools:$VERSION" \ diff --git a/salt/common/tools/sbin/soup b/salt/common/tools/sbin/soup index 48d9314a3..608394530 100755 --- a/salt/common/tools/sbin/soup +++ b/salt/common/tools/sbin/soup @@ -111,6 +111,7 @@ update_dockers() { "so-kibana" \ "so-kratos" \ "so-logstash" \ + "so-minio" \ "so-mysql" \ "so-nginx" \ "so-pcaptools" \ diff --git a/salt/minio/init.sls b/salt/minio/init.sls index 438face99..f85effe09 100644 --- a/salt/minio/init.sls +++ b/salt/minio/init.sls @@ -15,6 +15,8 @@ {% set access_key = salt['pillar.get']('minio:access_key', '') %} {% set access_secret = salt['pillar.get']('minio:access_secret', '') %} +{% set VERSION = salt['pillar.get']('global:soversion', 'HH1.2.2') %} +{% set IMAGEREPO = salt['pillar.get']('global:imagerepo') %} # Minio Setup minioconfdir: @@ -38,12 +40,9 @@ logstashbucket: - group: 939 - makedirs: True -minio/minio: - docker_image.present - minio: docker_container.running: - - image: minio/minio + - image: {{ MANAGER }}:5000/{{ IMAGEREPO }}/so-minio:{{ VERSION }} - hostname: so-minio - user: socore - port_bindings: diff --git a/setup/so-functions b/setup/so-functions index 7ebfe3f7a..de14447e4 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -789,6 +789,7 @@ docker_seed_registry() { "so-grafana:$VERSION" \ "so-influxdb:$VERSION" \ "so-kibana:$VERSION" \ + "so-minio:$VERSION" \ "so-mysql:$VERSION" \ "so-pcaptools:$VERSION" \ "so-playbook:$VERSION" \