From 72b4fd6451089d10002e08bdba1d929c88dc9665 Mon Sep 17 00:00:00 2001 From: aviau Date: Fri, 15 May 2015 08:55:15 -0400 Subject: [PATCH] Specify monitoring tools version Change-Id: Iabba036c9713506e4514737f741cc60459bbfc55 --- Dockerfile | 11 ++++++----- tools/docker/shinken_container/Dockerfile | 9 +++++---- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index ec23776..0561dff 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,12 +11,13 @@ RUN useradd shinken && pip install https://github.com/naparuba/shinken/archive/2 RUN pip install python-surveilclient==0.5.1 # Download packs +ENV MONITORING_TOOLS_VERSION 0.1.0 RUN apt-get install -y subversion && \ - svn checkout https://github.com/savoirfairelinux/monitoring-tools/trunk/packs/generic-host /packs/generic-host && \ - svn checkout https://github.com/savoirfairelinux/monitoring-tools/trunk/packs/linux-glance /packs/linux-glance && \ - svn checkout https://github.com/savoirfairelinux/monitoring-tools/trunk/packs/linux-cinder /packs/linux-cinder && \ - svn checkout https://github.com/savoirfairelinux/monitoring-tools/trunk/packs/linux-keystone /packs/linux-keystone && \ - svn checkout https://github.com/savoirfairelinux/monitoring-tools/trunk/packs/linux-nova /packs/linux-nova && \ + svn checkout https://github.com/savoirfairelinux/monitoring-tools/tags/${MONITORING_TOOLS_VERSION}/packs/generic-host /packs/generic-host && \ + svn checkout https://github.com/savoirfairelinux/monitoring-tools/tags/${MONITORING_TOOLS_VERSION}/packs/linux-glance /packs/linux-glance && \ + svn checkout https://github.com/savoirfairelinux/monitoring-tools/tags/${MONITORING_TOOLS_VERSION}/packs/linux-cinder /packs/linux-cinder && \ + svn checkout https://github.com/savoirfairelinux/monitoring-tools/tags/${MONITORING_TOOLS_VERSION}/packs/linux-keystone /packs/linux-keystone && \ + svn checkout https://github.com/savoirfairelinux/monitoring-tools/tags/${MONITORING_TOOLS_VERSION}/packs/linux-nova /packs/linux-nova && \ apt-get remove -y subversion ADD requirements.txt surveil/requirements.txt diff --git a/tools/docker/shinken_container/Dockerfile b/tools/docker/shinken_container/Dockerfile index d457904..abc4ac4 100644 --- a/tools/docker/shinken_container/Dockerfile +++ b/tools/docker/shinken_container/Dockerfile @@ -56,11 +56,12 @@ RUN chmod u+s /bin/ping RUN chmod u+s /bin/ping6 # Download plugins +ENV MONITORING_TOOLS_VERSION 0.1.0 RUN apt-get update && apt-get install -y subversion && \ - svn checkout https://github.com/savoirfairelinux/monitoring-tools/trunk/plugins/check-glance /plugins/check_glance && \ - svn checkout https://github.com/savoirfairelinux/monitoring-tools/trunk/plugins/check-keystone /plugins/check_keystone && \ - svn checkout https://github.com/savoirfairelinux/monitoring-tools/trunk/plugins/check-nova /plugins/check_nova && \ - svn checkout https://github.com/savoirfairelinux/monitoring-tools/trunk/plugins/check-cinder /plugins/check_cinder && \ + svn checkout https://github.com/savoirfairelinux/monitoring-tools/tags/${MONITORING_TOOLS_VERSION}/plugins/check-glance /plugins/check_glance && \ + svn checkout https://github.com/savoirfairelinux/monitoring-tools/tags/${MONITORING_TOOLS_VERSION}/plugins/check-keystone /plugins/check_keystone && \ + svn checkout https://github.com/savoirfairelinux/monitoring-tools/tags/${MONITORING_TOOLS_VERSION}/plugins/check-nova /plugins/check_nova && \ + svn checkout https://github.com/savoirfairelinux/monitoring-tools/tags/${MONITORING_TOOLS_VERSION}/plugins/check-cinder /plugins/check_cinder && \ apt-get remove -y subversion ## Install plugins dependencies