Dockerfiles directory isolated

atosorigin · Oct 5, 2019 · acaceab · acaceab
1 parent c7f3faf
commit acaceab
Show file tree

Hide file tree

Showing 35 changed files with 52 additions and 302 deletions.
diff --git a/Dockerfile-zabbix-postgres b/Dockerfile-zabbix-postgres
diff --git a/Dockerfile-awx_task → Dockerfiles/Dockerfile-awx_task b/Dockerfile-awx_task → Dockerfiles/Dockerfile-awx_task
diff --git a/Dockerfile-awx_web → Dockerfiles/Dockerfile-awx_web b/Dockerfile-awx_web → Dockerfiles/Dockerfile-awx_web
diff --git a/Dockerfile-zabbix → Dockerfiles/Dockerfile-zabbix b/Dockerfile-zabbix → Dockerfiles/Dockerfile-zabbix
diff --git a/Dockerfile-zabbix-agent → Dockerfiles/Dockerfile-zabbix-agent b/Dockerfile-zabbix-agent → Dockerfiles/Dockerfile-zabbix-agent
diff --git a/Dockerfile-zabbix-web → Dockerfiles/Dockerfile-zabbix-web b/Dockerfile-zabbix-web → Dockerfiles/Dockerfile-zabbix-web
diff --git a/ansible.SECRET_KEY → Dockerfiles/ansible.SECRET_KEY b/ansible.SECRET_KEY → Dockerfiles/ansible.SECRET_KEY
diff --git a/ansible.cors.py → Dockerfiles/ansible.cors.py b/ansible.cors.py → Dockerfiles/ansible.cors.py
diff --git a/ansible.credentials.py → Dockerfiles/ansible.credentials.py b/ansible.credentials.py → Dockerfiles/ansible.credentials.py
diff --git a/ansible.env → Dockerfiles/ansible.env b/ansible.env → Dockerfiles/ansible.env
diff --git a/ansible.environment.sh → Dockerfiles/ansible.environment.sh b/ansible.environment.sh → Dockerfiles/ansible.environment.sh
diff --git a/ansible.nginx.conf → Dockerfiles/ansible.nginx.conf b/ansible.nginx.conf → Dockerfiles/ansible.nginx.conf
diff --git a/app.000e14438f496b569c02.css → Dockerfiles/app.000e14438f496b569c02.css b/app.000e14438f496b569c02.css → Dockerfiles/app.000e14438f496b569c02.css
diff --git a/blue-theme.css → Dockerfiles/blue-theme.css b/blue-theme.css → Dockerfiles/blue-theme.css
diff --git a/custom_console_logo.png → Dockerfiles/custom_console_logo.png b/custom_console_logo.png → Dockerfiles/custom_console_logo.png
diff --git a/dark-theme.css → Dockerfiles/dark-theme.css b/dark-theme.css → Dockerfiles/dark-theme.css
diff --git a/items.inc.php → Dockerfiles/items.inc.php b/items.inc.php → Dockerfiles/items.inc.php
diff --git a/loginModal.partial.html → Dockerfiles/loginModal.partial.html b/loginModal.partial.html → Dockerfiles/loginModal.partial.html
diff --git a/logo-atos-header.svg → Dockerfiles/logo-atos-header.svg b/logo-atos-header.svg → Dockerfiles/logo-atos-header.svg
diff --git a/logo-atos-login.svg → Dockerfiles/logo-atos-login.svg b/logo-atos-login.svg → Dockerfiles/logo-atos-login.svg
diff --git a/logo-header.svg → Dockerfiles/logo-header.svg b/logo-header.svg → Dockerfiles/logo-header.svg
diff --git a/logo-login.svg → Dockerfiles/logo-login.svg b/logo-login.svg → Dockerfiles/logo-login.svg
diff --git a/zabbix.env → Dockerfiles/zabbix.env b/zabbix.env → Dockerfiles/zabbix.env
diff --git a/docker-compose-awx.yml b/docker-compose-awx.yml
@@ -3,7 +3,7 @@ services:
 
   awx_web:
     build: 
-      context: .
+      context: Dockerfiles
       dockerfile: Dockerfile-awx_web
       args:
         mism_version: ${MISM_BULLSEQUANA_EDGE_VERSION}
@@ -31,11 +31,11 @@ services:
       - ./ansible/awx-ssl:/var/lib/awx-ssl:rw
       - /:/host:ro
     env_file:
-      - ansible.env
+      - Dockerfiles/ansible.env
 
   awx_task:
     build: 
-      context: .
+      context: Dockerfiles
       dockerfile: Dockerfile-awx_task
       args:
         mism_version: ${MISM_BULLSEQUANA_EDGE_VERSION}
@@ -62,7 +62,7 @@ services:
       - ./ansible/awx-ssl:/var/lib/awx-ssl:rw
       - /:/host:ro
     env_file:
-      - ansible.env
+      - Dockerfiles/ansible.env
 
   rabbitmq:
     image: rabbitmq:3-management
@@ -76,7 +76,7 @@ services:
       - 15672:15672
       - 5672:5672    
     env_file:
-      - ansible.env
+      - Dockerfiles/ansible.env
 
   memcached:
     image: memcached:alpine
@@ -95,7 +95,7 @@ services:
     volumes:
       - ./ansible/pgdata:/var/lib/postgresql/data/pgdata:Z
     env_file:
-      - ansible.env
+      - Dockerfiles/ansible.env
     environment:
       PGDATA: /var/lib/postgresql/data/pgdata
 
@@ -111,5 +111,5 @@ services:
     volumes:
       - ./pgadmin:/var/lib/pgadmin/storage:Z
     env_file:
-      - ansible.env
+      - Dockerfiles/ansible.env
 
diff --git a/docker-compose-zabbix.yml b/docker-compose-zabbix.yml
@@ -2,7 +2,7 @@ version: '3.6'
 services:
   zabbix-server:
     build:
-      context:  .
+      context: Dockerfiles
       dockerfile: Dockerfile-zabbix
       args:
         mism_version: ${MISM_BULLSEQUANA_EDGE_VERSION}
@@ -35,7 +35,7 @@ services:
 
   zabbix-web:
     build:
-      context:  .
+      context: Dockerfiles
       dockerfile: Dockerfile-zabbix-web
       args:
         mism_version: ${MISM_BULLSEQUANA_EDGE_VERSION}
@@ -55,7 +55,7 @@ services:
 
   zabbix-agent:
     build:
-      context:  .
+      context: Dockerfiles
       dockerfile: Dockerfile-zabbix-agent
       args:
         mism_version: ${MISM_BULLSEQUANA_EDGE_VERSION}
@@ -85,9 +85,7 @@ services:
       - zabbix-server:zabbix-server
 
   zabbix-postgres:
-    build:
-      context: .
-      dockerfile: Dockerfile-zabbix-postgres
+    image: postgres:latest
     container_name: zabbix-postgres
     hostname: zabbix-postgres
     restart: unless-stopped

diff --git a/git_readme.md b/git_readme.md
diff --git a/index.html b/index.html
diff --git a/install_awx.sh b/install_awx.sh
@@ -1,19 +1,22 @@
 #!/bin/sh
 
 # restore images ...
-echo "load mism_rabbitmq ..."
-docker load -i mism_rabbitmq.tar
-echo "load mism_awx_postgres ..."
-docker load -i mism_awx_postgres.tar
-echo "load mism_memcached ..."
-docker load -i mism_memcached.tar
-echo "load mism_awx_web ..."
-docker load -i mism_awx_web.tar
-echo "load mism_awx_task ..."
-docker load -i mism_awx_task.tar
+#echo "load mism_rabbitmq ..."
+#docker load -i mism_rabbitmq.tar
+#echo "load mism_awx_postgres ..."
+#docker load -i mism_awx_postgres.tar
+#echo "load mism_memcached ..."
+#docker load -i mism_memcached.tar
+#echo "load mism_awx_web ..."
+#docker load -i mism_awx_web.tar
+#echo "load mism_awx_task ..."
+#docker load -i mism_awx_task.tar
+echo "building BullSequana Edge Ansible AWX containers ...."
+docker-compose -f docker-compose-awx.yml build
+
+echo "starting BullSequana Edge Ansible AWX containers ...."
+docker-compose -f docker-compose-awx.yml up -d
 
-echo "start MISM AWX containers ...."
-docker-compose -f docker-compose-mism-awx.yml up -d
 echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
 echo "now wait 10 minutes for the migration to complete...."
 echo "check the login page at https://localhost"

diff --git a/install_zabbix.sh b/install_zabbix.sh
@@ -1,19 +1,22 @@
 #!/bin/sh
 
 # restore images ...
-echo "load mism_zabbix-server ..."
-docker load -i mism_zabbix-server.tar
-echo "load mism_zabbix-agent ..."
-docker load -i mism_zabbix-agent.tar
-echo "load mism_zabbix-web ..."
-docker load -i mism_zabbix-web.tar
-echo "load mism_pgadmin ..."
-docker load -i mism_pgadmin.tar
-echo "load mism_zabbix-postgres ..."
-docker load -i mism_zabbix-postgres.tar
+#echo "load mism_zabbix-server ..."
+#docker load -i mism_zabbix-server.tar
+#echo "load mism_zabbix-agent ..."
+#docker load -i mism_zabbix-agent.tar
+#echo "load mism_zabbix-web ..."
+#docker load -i mism_zabbix-web.tar
+#echo "load mism_pgadmin ..."
+#docker load -i mism_pgadmin.tar
+#echo "load mism_zabbix-postgres ..."
+#docker load -i mism_zabbix-postgres.tar
 
-echo "start MISM zabbix containers ...."
-docker-compose -f docker-compose-mism-zabbix.yml up -d
+echo "building BullSequana Edge Zabbix containers ...."
+docker-compose -f docker-compose-zabbix.yml build
+
+echo "starting BullSequana Edge Zabbix containers ...."
+docker-compose -f docker-compose-zabbix.yml up -d
 echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
 echo "Zabbix is available on https://localhost:4443"
 echo "for more info, refer to documentation"