Merge pull request #201 from Mirantis/add_defaults
add defaults for cicd
diff --git a/aptly/server/docker.yml b/aptly/server/docker.yml
index 6038976..ee8f4a2 100644
--- a/aptly/server/docker.yml
+++ b/aptly/server/docker.yml
@@ -2,7 +2,10 @@
- service.aptly.server.single
parameters:
_param:
- aptly_server_secure: true
+ aptly_server_secure: false
+ aptly_gpg_keypair_id: none
+ aptly_gpg_public_key: none
+ aptly_gpg_private_key: none
aptly:
server:
enabled: true
diff --git a/docker/swarm/service/aptly.yml b/docker/swarm/service/aptly.yml
index d85b1b4..5f6de6e 100644
--- a/docker/swarm/service/aptly.yml
+++ b/docker/swarm/service/aptly.yml
@@ -1,4 +1,8 @@
parameters:
+ _param:
+ docker_image_aptly:
+ api: tcpcloud/aptly-api
+ public: tcpcloud/aptly-public
docker:
client:
service:
diff --git a/docker/swarm/service/docker.yml b/docker/swarm/service/docker.yml
index a79fc08..d20b4db 100644
--- a/docker/swarm/service/docker.yml
+++ b/docker/swarm/service/docker.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ docker_image_registry: registry:2
docker:
client:
service:
diff --git a/docker/swarm/service/gerrit.yml b/docker/swarm/service/gerrit.yml
index d1bdfae..d33bdbb 100644
--- a/docker/swarm/service/gerrit.yml
+++ b/docker/swarm/service/gerrit.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ docker_image_gerrit: tcpcloud/gerrit:2.12.7
docker:
client:
service:
diff --git a/docker/swarm/service/jenkins.yml b/docker/swarm/service/jenkins.yml
index c0b0721..3069dc6 100644
--- a/docker/swarm/service/jenkins.yml
+++ b/docker/swarm/service/jenkins.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ docker_image_jenkins: tcpcloud/jenkins:2.50
docker:
client:
service:
diff --git a/docker/swarm/service/mysql.yml b/docker/swarm/service/mysql.yml
index 53faa8b..f94cf4d 100644
--- a/docker/swarm/service/mysql.yml
+++ b/docker/swarm/service/mysql.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ docker_image_mysql: mysql:5.6
docker:
client:
service:
@@ -10,7 +12,7 @@
MYSQL_ROOT_PASSWORD: ${_param:mysql_admin_password}
restart:
condition: any
- image: "mysql:5.6"
+ image: "${_param:docker_image_mysql}"
ports:
- 13306:3306
volume:
diff --git a/docker/swarm/service/openldap.yml b/docker/swarm/service/openldap.yml
index d009ed5..e390772 100644
--- a/docker/swarm/service/openldap.yml
+++ b/docker/swarm/service/openldap.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ docker_image_openldap: osixia/openldap:1.1.7
docker:
client:
service:
@@ -7,7 +9,7 @@
# https://github.com/docker/docker/issues/24877
restart:
condition: any
- image: osixia/openldap:1.1.7
+ image: ${_param:docker_image_openldap}
environment:
HOSTNAME: ldap01.${_param:cluster_public_host}
LDAP_ORGANISATION: "${_param:openldap_organisation}"
diff --git a/docker/swarm/service/visualizer.yml b/docker/swarm/service/visualizer.yml
index fe52c0b..8519363 100644
--- a/docker/swarm/service/visualizer.yml
+++ b/docker/swarm/service/visualizer.yml
@@ -1,11 +1,13 @@
parameters:
+ _param:
+ docker_image_visualizer: manomarks/visualizer
docker:
client:
service:
visualizer:
restart:
condition: any
- image: manomarks/visualizer
+ image: ${_param:docker_image_visualizer}
constraint: "node.role==manager"
ports:
- 18090:8080