Docker Playground

monitoringartist · Dec 24, 2017 · 2254919 · 2254919
1 parent d2e374b
commit 2254919
Show file tree

Hide file tree

Showing 6 changed files with 65 additions and 6 deletions.
diff --git a/Dockerfile/dockbix-xxl/Dockerfile b/Dockerfile/dockbix-xxl/Dockerfile
@@ -182,7 +182,7 @@ RUN \
   grep 'XXL' /usr/local/src/zabbix/frontends/php/include/defines.inc.php && \
   sed -i "s#]))->addClass(ZBX_STYLE_FOOTER);#,' / ',(new CLink('Monitoring Artist Ltd', 'http://www.monitoringartist.com'))->addClass(ZBX_STYLE_GREY)->addClass(ZBX_STYLE_LINK_ALT)->setAttribute('target', '_blank'),]))->addClass(ZBX_STYLE_FOOTER);#g" /usr/local/src/zabbix/frontends/php/include/html.inc.php && \
   grep 'www.monitoringartist.com' /usr/local/src/zabbix/frontends/php/include/html.inc.php && \
-  sed -i "s/(new CDiv())->addClass(ZBX_STYLE_SIGNIN_LOGO),/(new CDiv())->addClass(ZBX_STYLE_SIGNIN_LOGO),(new CDiv())->addClass(ZBX_STYLE_CENTER)->addItem((new CTag('h1', true, _('Zabbix XXL')))->addClass(ZBX_STYLE_BLUE))->addItem((new CLink(_('Maintained by Monitoring Artist'), 'http:\/\/www.monitoringartist.com'))->setTarget('_blank')->addClass(ZBX_STYLE_GREY)),/g" /usr/local/src/zabbix/frontends/php/include/views/general.login.php && \
+  sed -i "s/(new CDiv())->addClass(ZBX_STYLE_SIGNIN_LOGO),/(new CDiv())->addClass(ZBX_STYLE_SIGNIN_LOGO),(new CDiv())->addClass(ZBX_STYLE_CENTER)->addItem((new CTag('h1', true, _('Dockbix XXL')))->addClass(ZBX_STYLE_BLUE))->addItem((new CLink(_('Maintained by Monitoring Artist'), 'http:\/\/www.monitoringartist.com'))->setTarget('_blank')->addClass(ZBX_STYLE_GREY)),/g" /usr/local/src/zabbix/frontends/php/include/views/general.login.php && \
   grep 'www.monitoringartist.com' /usr/local/src/zabbix/frontends/php/include/views/general.login.php && \
   sed -i "s#echo '</body></html>';#echo \"<script>(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)})(window,document,'script','//www.google-analytics.com/analytics.js','ga');ga('create','UA-72810204-2','auto');ga('send','pageview');</script></body></html>\";#g" /usr/local/src/zabbix/frontends/php/include/page_footer.php && \
   grep 'UA-72810204-2' /usr/local/src/zabbix/frontends/php/include/page_footer.php && \

diff --git a/Dockerfile/dockbix-xxl/retag.sh b/Dockerfile/dockbix-xxl/retag.sh
@@ -18,7 +18,7 @@ git push origin master
 git push origin --tags
 
 # create tags from the list
-tags=('3.4.0' '3.4.1' '3.4.2' '3.4.3' '3.4.4');
+tags=('3.4.0' '3.4.1' '3.4.2' '3.4.3' '3.4.4' '3.4.5');
 for t in "${tags[@]}"
 do
     echo "Creating tag $t"

diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
@@ -1,9 +1,6 @@
 <!--
 
-Have you read SUPPORT page?
-Please read: https://github.com/monitoringartist/dockbix-xxl/blob/master/SUPPORT.md
-
-Do you want to ask a question about Zabbix? Are you looking for Zabbix support?
+Do you want to ask a question about Zabbix or are you looking Zabbix support?
 Please find better place: http://zabbix.org/wiki/Getting_help
 
 Do you want commercial paid support from Monitoring Artist?

diff --git a/README.md b/README.md
@@ -6,6 +6,10 @@
 
 If you like or use this project, please provide feedback to the author - Star it ★ or star upstream projects ★.
 
+**Test Dockbix for free** in your browser. You need only free [Docker ID](https://cloud.docker.com/), and you will
+be able to start full containerized Dockbix XXL for 4 hours for free. You may also test latest dev version (compiled from the `trunk` svn branch):
+[![Docker Playground](https://img.shields.io/badge/Start_on_Docker_Playground-LATEST_version-green.svg?style=for-the-badge)](http://play-with-docker.com/?stack=https://raw.githubusercontent.com/monitoringartist/dockbix-xxl/master/stack-play-with-docker.yml) [![Docker Playground](https://img.shields.io/badge/Start_on_Docker_Playground-DEV_version-orange.svg?style=for-the-badge)](http://play-with-docker.com/?stack=https://raw.githubusercontent.com/monitoringartist/dockbix-xxl/master/stack-play-with-docker-dev.yml)
+
 ----
 
 **Overview of Monitoring Artist (dockerized) monitoring ecosystem:**

diff --git a/stack-play-with-docker-dev.yml b/stack-play-with-docker-dev.yml
@@ -0,0 +1,29 @@
+version: '3.1'
+
+services:
+
+  zabbixdb:
+    image: monitoringartist/zabbix-db-mariadb:latest
+    volumes:
+      - /etc/localtime:/etc/localtime:ro
+    environment:
+      - MARIADB_USER=zabbix
+      - MARIADB_PASS=my_password
+
+  zabbixserver:
+    image: monitoringartist/dockbix-xxl:dev
+    depends_on:
+      - zabbixdb
+    ports:
+      - "80:80"
+      - "10051:10051"
+    volumes:
+      - /etc/localtime:/etc/localtime:ro
+    links:
+      - zabbixdb:zabbixdb
+    environment:
+      - ZS_DBHost=zabbixdb
+      - ZS_DBUser=zabbix
+      - ZS_DBPassword=my_password
+      - XXL_zapix=true
+      - XXL_grapher=true
diff --git a/stack-play-with-docker.yml b/stack-play-with-docker.yml
@@ -0,0 +1,29 @@
+version: '3.1'
+
+services:
+
+  zabbixdb:
+    image: monitoringartist/zabbix-db-mariadb:latest
+    volumes:
+      - /etc/localtime:/etc/localtime:ro
+    environment:
+      - MARIADB_USER=zabbix
+      - MARIADB_PASS=my_password
+
+  zabbixserver:
+    image: monitoringartist/dockbix-xxl:latest
+    depends_on:
+      - zabbixdb
+    ports:
+      - "80:80"
+      - "10051:10051"
+    volumes:
+      - /etc/localtime:/etc/localtime:ro
+    links:
+      - zabbixdb:zabbixdb
+    environment:
+      - ZS_DBHost=zabbixdb
+      - ZS_DBUser=zabbix
+      - ZS_DBPassword=my_password
+      - XXL_zapix=true
+      - XXL_grapher=true