From 2254919aef53bb18c975ec21826dfd144909de17 Mon Sep 17 00:00:00 2001 From: Jan Garaj Date: Sun, 24 Dec 2017 11:19:26 +0000 Subject: [PATCH] Docker Playground --- Dockerfile/dockbix-xxl/Dockerfile | 2 +- Dockerfile/dockbix-xxl/retag.sh | 2 +- ISSUE_TEMPLATE.md | 5 +---- README.md | 4 ++++ stack-play-with-docker-dev.yml | 29 +++++++++++++++++++++++++++++ stack-play-with-docker.yml | 29 +++++++++++++++++++++++++++++ 6 files changed, 65 insertions(+), 6 deletions(-) create mode 100644 stack-play-with-docker-dev.yml create mode 100644 stack-play-with-docker.yml diff --git a/Dockerfile/dockbix-xxl/Dockerfile b/Dockerfile/dockbix-xxl/Dockerfile index 710e5e4..a85cb49 100644 --- 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 '';#echo \"\";#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 index c9e1f32..169d155 100644 --- 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 index 0c0e87e..f94930d 100644 --- a/ISSUE_TEMPLATE.md +++ b/ISSUE_TEMPLATE.md @@ -1,9 +1,6 @@