Changed references to tcpcloud/ docker images to mirantis/
Change-Id: Id91481df94c9f6d7e4dd824a5ddb3e637254f34d
diff --git a/docker/client/compose/service/gerrit.yml b/docker/client/compose/service/gerrit.yml
index eeb126e..50d933b 100644
--- a/docker/client/compose/service/gerrit.yml
+++ b/docker/client/compose/service/gerrit.yml
@@ -2,8 +2,8 @@
- system.docker.client.compose
parameters:
_param:
- docker_image_gerrit: tcpcloud/gerrit:2.13.6
- docker_image_mysql: tcpcloud/mysql:5.6
+ docker_image_gerrit: mirantis/gerrit:2.13.6
+ docker_image_mysql: mirantis/mysql:5.6
gerrit_ldap_server: ""
gerrit_ldap_bind_user: ""
gerrit_ldap_bind_password: ""
diff --git a/docker/client/compose/service/jenkins.yml b/docker/client/compose/service/jenkins.yml
index 7db9da5..5054909 100644
--- a/docker/client/compose/service/jenkins.yml
+++ b/docker/client/compose/service/jenkins.yml
@@ -2,7 +2,7 @@
- system.docker.client.compose
parameters:
_param:
- docker_image_jenkins: tcpcloud/jenkins:2.100
+ docker_image_jenkins: mirantis/jenkins:2.100
jenkins_master_extra_opts: ""
jenkins_master_executors_num: 4
jenkins_master_max_concurent_requests: 40
diff --git a/docker/swarm/stack/aptly.yml b/docker/swarm/stack/aptly.yml
index 89ec5ec..a7928f7 100644
--- a/docker/swarm/stack/aptly.yml
+++ b/docker/swarm/stack/aptly.yml
@@ -4,8 +4,11 @@
_param:
docker_stack_aptly_public_replicas: 3
docker_image_aptly:
- api: tcpcloud/aptly-api
- public: tcpcloud/aptly-public
+ # This image is temporary replacement for mirantis/aptly-api because of acquire_by_hash bug
+ # https://github.com/smira/aptly/pull/697. We waiting for new release of aptly
+ api: breton/aptly-api
+ #api: mirantis/aptly-api
+ public: mirantis/aptly-public
docker:
client:
stack:
diff --git a/docker/swarm/stack/gerrit.yml b/docker/swarm/stack/gerrit.yml
index 49d0a11..ad3ea6d 100644
--- a/docker/swarm/stack/gerrit.yml
+++ b/docker/swarm/stack/gerrit.yml
@@ -2,8 +2,8 @@
- system.docker
parameters:
_param:
- docker_image_gerrit: tcpcloud/gerrit:2.13.6
- docker_image_mysql: tcpcloud/mysql:5.6
+ docker_image_gerrit: mirantis/gerrit:2.13.6
+ docker_image_mysql: mirantis/mysql:5.6
gerrit_ldap_server: ""
gerrit_ldap_bind_user: ""
gerrit_ldap_bind_password: ""
diff --git a/docker/swarm/stack/jenkins/master.yml b/docker/swarm/stack/jenkins/master.yml
index d08bf71..890f8da 100644
--- a/docker/swarm/stack/jenkins/master.yml
+++ b/docker/swarm/stack/jenkins/master.yml
@@ -2,7 +2,7 @@
- system.docker
parameters:
_param:
- docker_image_jenkins: tcpcloud/jenkins:2.100
+ docker_image_jenkins: mirantis/jenkins:2.100
jenkins_master_extra_opts: ""
jenkins_master_executors_num: 4
jenkins_master_max_concurent_requests: 40
diff --git a/docker/swarm/stack/jenkins/slave.yml b/docker/swarm/stack/jenkins/slave.yml
index 12a14d4..42a0031 100644
--- a/docker/swarm/stack/jenkins/slave.yml
+++ b/docker/swarm/stack/jenkins/slave.yml
@@ -2,7 +2,7 @@
- system.docker
parameters:
_param:
- docker_image_jenkins_slave: tcpcloud/jnlp-slave
+ docker_image_jenkins_slave: mirantis/jnlp-slave
jenkins_master_host: ${_param:control_vip_address}
jenkins_master_port: 8081
jenkins_secret: "7c40abc1a7df2d26dd6b2e4421af17218df75a16fcbd5e3aa6017d9f47eaeabe"
diff --git a/docker/swarm/stack/ldap.yml b/docker/swarm/stack/ldap.yml
index a5fe135..f4866f1 100644
--- a/docker/swarm/stack/ldap.yml
+++ b/docker/swarm/stack/ldap.yml
@@ -1,7 +1,7 @@
parameters:
_param:
docker_image_openldap: osixia/openldap:1.1.8
- docker_image_phpldapadmin: tcpcloud/phpldapadmin:0.6.12
+ docker_image_phpldapadmin: mirantis/phpldapadmin:0.6.12
docker:
client:
stack: