synchro with bitbucket 2.1.1

atosorigin · Jul 28, 2020 · 2ba3f28 · 2ba3f28
1 parent f4e0986
commit 2ba3f28
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 22 deletions.
diff --git a/Dockerfiles/zabbix.env b/Dockerfiles/zabbix.env
@@ -4,14 +4,12 @@ ZBX_SERVER_NAME=zabbix-server
 ZBX_SERVER=zabbix-server
 ZBX_SERVER_PORT=10051
 DB_SERVER_HOST=zabbix-postgres
-DB_SERVER_PORT=5555
 DB_SERVER_DBNAME=zabbix
 DB_SERVER_ZBX_USER=zabbix
 DB_SERVER_ZBX_PASS=mismpass
 POSTGRES_USER=zabbix
 POSTGRES_PASSWORD=mismpass
 POSTGRES_DB=zabbix
-POSTGRES_PORT=5555
 ZBX_ACTIVESERVERS=zabbix-server
 ZBX_ACTIVE_ALLOW=1
 ZBX_ENABLEREMOTECOMMANDS=1

diff --git a/docker_compose_awx.yml b/docker_compose_awx.yml
@@ -15,7 +15,7 @@ services:
       - "443:8052"
     hostname: awx_web
     user: root
-    restart: unless-stopped
+    restart: always
     volumes:
       - ./ansible/playbooks:/var/lib/awx/projects:rw
       - ./ansible/inventory:/var/lib/awx/inventory:rw
@@ -51,7 +51,7 @@ services:
     # command: ["/var/lib/awx/projects/add_playbooks.py", "/var/lib/awx/projects/playbooks.yml"]
     hostname: awx
     user: root
-    restart: unless-stopped
+    restart: always
     volumes:
       - ./ansible/playbooks:/var/lib/awx/projects:rw
       - ./ansible/inventory:/var/lib/awx/inventory:rw
@@ -75,7 +75,7 @@ services:
   rabbitmq:
     image: rabbitmq:${RABBITMQ_AWX_BULLSEQUANA_EDGE_VERSION}
     container_name: awx_rabbitmq
-    restart: unless-stopped
+    restart: always
     hostname: rabbitmq
     expose:
       - 15672
@@ -89,13 +89,13 @@ services:
   memcached:
     image: memcached:${MEMCACHED_AWX_BULLSEQUANA_EDGE_VERSION}
     container_name: awx_memcached
-    restart: unless-stopped
+    restart: always
 
   awx_postgres:
     image: postgres:${POSTGRES_AWX_BULLSEQUANA_EDGE_VERSION}
     container_name: awx_postgres
     hostname: awx_postgres
-    restart: unless-stopped
+    restart: always
     ports:
       - 5432:5432
     expose: 
@@ -113,7 +113,7 @@ services:
     depends_on:
       - awx_postgres
     user: root
-    restart: unless-stopped
+    restart: always
     ports:
       - 7070:80
     volumes:

diff --git a/docker_compose_awx_from_atos_dockerhub.yml b/docker_compose_awx_from_atos_dockerhub.yml
@@ -12,7 +12,7 @@ services:
       - "443:8052"
     hostname: awx_web
     user: root
-    restart: unless-stopped
+    restart: always
     volumes:
       - ./ansible/playbooks:/var/lib/awx/projects:rw
       - ./ansible/inventory:/var/lib/awx/inventory:rw
@@ -41,7 +41,7 @@ services:
     # command: ["/var/lib/awx/projects/add_playbooks.py", "/var/lib/awx/projects/playbooks.yml"]
     hostname: awx
     user: root
-    restart: unless-stopped
+    restart: always
     volumes:
       - ./ansible/playbooks:/var/lib/awx/projects:rw
       - ./ansible/inventory:/var/lib/awx/inventory:rw
@@ -61,7 +61,7 @@ services:
   rabbitmq:
     image: rabbitmq:${RABBITMQ_AWX_BULLSEQUANA_EDGE_VERSION}
     container_name: awx_rabbitmq
-    restart: unless-stopped
+    restart: always
     hostname: rabbitmq
     expose:
       - 15672
@@ -75,13 +75,13 @@ services:
   memcached:
     image: memcached:${MEMCACHED_AWX_BULLSEQUANA_EDGE_VERSION}
     container_name: awx_memcached
-    restart: unless-stopped
+    restart: always
 
   awx_postgres:
     image: postgres:${POSTGRES_AWX_BULLSEQUANA_EDGE_VERSION}
     container_name: awx_postgres
     hostname: awx_postgres
-    restart: unless-stopped
+    restart: always
     ports:
       - 5432:5432
     expose: 
@@ -99,7 +99,7 @@ services:
     depends_on:
       - awx_postgres
     user: root
-    restart: unless-stopped
+    restart: always
     ports:
       - 7070:80
     volumes:

diff --git a/docker_compose_zabbix.yml b/docker_compose_zabbix.yml
@@ -11,7 +11,7 @@ services:
       - 10051
     user: root
     privileged : true
-    restart: unless-stopped       
+    restart: always       
     container_name: zabbix-server
     hostname: zabbix-server
     volumes:
@@ -34,7 +34,7 @@ services:
     build:
       context: Dockerfiles
       dockerfile: Dockerfile-zabbix-web.${MISM_TAG_BULLSEQUANA_EDGE_VERSION}
-    restart: unless-stopped    
+    restart: always    
     container_name: zabbix-web
     env_file:
       - Dockerfiles/zabbix.env
@@ -64,7 +64,7 @@ services:
     privileged : true
     depends_on:
       - zabbix-server
-    restart: unless-stopped
+    restart: always
     container_name: zabbix-agent
     hostname: zabbix-agent
     env_file:
@@ -88,7 +88,7 @@ services:
     image: postgres:${POSTGRES_ZABBIX_BULLSEQUANA_EDGE_VERSION}
     container_name: zabbix-postgres
     hostname: zabbix-postgres
-    restart: unless-stopped
+    restart: always
     env_file:
       - Dockerfiles/zabbix.env
     environment:

diff --git a/docker_compose_zabbix_from_atos_dockerhub.yml b/docker_compose_zabbix_from_atos_dockerhub.yml
@@ -8,7 +8,7 @@ services:
       - 10051
     user: root
     privileged : true
-    restart: unless-stopped       
+    restart: always       
     container_name: zabbix-server
     hostname: zabbix-server
     volumes:
@@ -34,7 +34,7 @@ services:
 
   zabbix-web:
     image: atosorigin/bull-sequana-edge-zabbix-web:${MISM_BULLSEQUANA_EDGE_VERSION}
-    restart: unless-stopped    
+    restart: always    
     container_name: zabbix-web
     env_file:
       - Dockerfiles/zabbix.env
@@ -61,7 +61,7 @@ services:
     privileged : true
     depends_on:
       - zabbix-server
-    restart: unless-stopped
+    restart: always
     container_name: zabbix-agent
     hostname: zabbix-agent
     env_file:
@@ -85,7 +85,7 @@ services:
     image: postgres:${POSTGRES_ZABBIX_BULLSEQUANA_EDGE_VERSION}
     container_name: zabbix-postgres
     hostname: zabbix-postgres
-    restart: unless-stopped
+    restart: always
     env_file:
       - Dockerfiles/zabbix.env
     environment: