Merge pull request #220 from hubblestack/develop

Merge to master (prep v2.2.8)
hubblestack · Oct 4, 2017 · 552c5f6 · 552c5f6
2 parents e316d7d + 6846629
commit 552c5f6
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 17 deletions.
diff --git a/hubblestack/__init__.py b/hubblestack/__init__.py
@@ -1 +1 @@
-__version__ = '2.2.7'
+__version__ = '2.2.8'
diff --git a/hubblestack/extmods/fileserver/azurefs.py b/hubblestack/extmods/fileserver/azurefs.py
@@ -262,6 +262,11 @@ def update():
             os.unlink(lk_fn)
         except Exception:
             pass
+        try:
+            hash_cachedir = os.path.join(__opts__['cachedir'], 'azurefs', 'hashes')
+            shutil.rmtree(hash_cachedir)
+        except Exception:
+            log.exception('Problem occurred trying to invalidate hash cach for azurefs')
 
 
 def file_hash(load, fnd):

diff --git a/pkg/amazonlinux2016.09/Dockerfile b/pkg/amazonlinux2016.09/Dockerfile
@@ -91,8 +91,8 @@ RUN yum install -y ruby ruby-devel rpmbuild rubygems gcc make \
 #pyinstaller start
 #commands specified for ENTRYPOINT and CMD are executed when the container is run, not when the image is built
 #use the following variables to choose the version of hubble
-ENV HUBBLE_CHECKOUT=v2.2.7
-ENV HUBBLE_VERSION=2.2.7
+ENV HUBBLE_CHECKOUT=v2.2.8
+ENV HUBBLE_VERSION=2.2.8
 ENV HUBBLE_GIT_URL=https://github.com/hubblestack/hubble.git
 ENV HUBBLE_SRC_PATH=/hubble_src
 ENV _HOOK_DIR="./pkg/"

diff --git a/pkg/amazonlinux2017.03/Dockerfile b/pkg/amazonlinux2017.03/Dockerfile
@@ -91,8 +91,8 @@ RUN yum install -y ruby ruby-devel rpmbuild rubygems gcc make \
 #pyinstaller start
 #commands specified for ENTRYPOINT and CMD are executed when the container is run, not when the image is built
 #use the following variables to choose the version of hubble
-ENV HUBBLE_CHECKOUT=v2.2.7
-ENV HUBBLE_VERSION=2.2.7
+ENV HUBBLE_CHECKOUT=v2.2.8
+ENV HUBBLE_VERSION=2.2.8
 ENV HUBBLE_GIT_URL=https://github.com/hubblestack/hubble.git
 ENV HUBBLE_SRC_PATH=/hubble_src
 ENV _HOOK_DIR="./pkg/"

diff --git a/pkg/centos6/Dockerfile b/pkg/centos6/Dockerfile
@@ -93,8 +93,8 @@ RUN yum install -y rpmbuild gcc make rh-ruby23 rh-ruby23-ruby-devel \
 #pyinstaller start
 #commands specified for ENTRYPOINT and CMD are executed when the container is run, not when the image is built
 #use the following variables to choose the version of hubble
-ENV HUBBLE_CHECKOUT=v2.2.7
-ENV HUBBLE_VERSION=2.2.7
+ENV HUBBLE_CHECKOUT=v2.2.8
+ENV HUBBLE_VERSION=2.2.8
 ENV HUBBLE_GIT_URL=https://github.com/hubblestack/hubble.git
 ENV HUBBLE_SRC_PATH=/hubble_src
 ENV _HOOK_DIR="./pkg/"

diff --git a/pkg/centos7/Dockerfile b/pkg/centos7/Dockerfile
@@ -90,8 +90,8 @@ RUN yum install -y ruby ruby-devel rpmbuild rubygems gcc make \
 #pyinstaller start
 #commands specified for ENTRYPOINT and CMD are executed when the container is run, not when the image is built
 #use the following variables to choose the version of hubble
-ENV HUBBLE_CHECKOUT=v2.2.7
-ENV HUBBLE_VERSION=2.2.7
+ENV HUBBLE_CHECKOUT=v2.2.8
+ENV HUBBLE_VERSION=2.2.8
 ENV HUBBLE_GIT_URL=https://github.com/hubblestack/hubble.git
 ENV HUBBLE_SRC_PATH=/hubble_src
 ENV _HOOK_DIR="./pkg/"

diff --git a/pkg/coreos/Dockerfile b/pkg/coreos/Dockerfile
@@ -88,8 +88,8 @@ RUN pip install --upgrade pip \
 #pyinstaller start
 #commands specified for ENTRYPOINT and CMD are executed when the container is run, not when the image is built
 #use the following variables to choose the version of hubble
-ENV HUBBLE_CHECKOUT=v2.2.7
-ENV HUBBLE_VERSION=2.2.7
+ENV HUBBLE_CHECKOUT=v2.2.8
+ENV HUBBLE_VERSION=2.2.8
 ENV HUBBLE_GIT_URL=https://github.com/hubblestack/hubble.git
 ENV HUBBLE_SRC_PATH=/hubble_src
 ENV _HOOK_DIR="./pkg/"

diff --git a/pkg/debian7/Dockerfile b/pkg/debian7/Dockerfile
@@ -115,8 +115,8 @@ RUN apt-get install -y ruby ruby-dev rubygems gcc make \
 #pyinstaller start
 #commands specified for ENTRYPOINT and CMD are executed when the container is run, not when the image is built
 #use the following variables to choose the version of hubble
-ENV HUBBLE_CHECKOUT=v2.2.7
-ENV HUBBLE_VERSION=2.2.7
+ENV HUBBLE_CHECKOUT=v2.2.8
+ENV HUBBLE_VERSION=2.2.8
 ENV HUBBLE_GIT_URL=https://github.com/hubblestack/hubble.git
 ENV HUBBLE_SRC_PATH=/hubble_src
 ENV _HOOK_DIR="./pkg/"

diff --git a/pkg/debian8/Dockerfile b/pkg/debian8/Dockerfile
@@ -96,8 +96,8 @@ RUN apt-get install -y ruby ruby-dev rubygems gcc make \
 #pyinstaller start
 #commands specified for ENTRYPOINT and CMD are executed when the container is run, not when the image is built
 #use the following variables to choose the version of hubble
-ENV HUBBLE_CHECKOUT=v2.2.7
-ENV HUBBLE_VERSION=2.2.7
+ENV HUBBLE_CHECKOUT=v2.2.8
+ENV HUBBLE_VERSION=2.2.8
 ENV HUBBLE_GIT_URL=https://github.com/hubblestack/hubble.git
 ENV HUBBLE_SRC_PATH=/hubble_src
 ENV _HOOK_DIR="./pkg/"

diff --git a/pkg/debian9/Dockerfile b/pkg/debian9/Dockerfile
@@ -92,8 +92,8 @@ RUN apt-get install -y ruby ruby-dev rubygems gcc make \
 #pyinstaller start
 #commands specified for ENTRYPOINT and CMD are executed when the container is run, not when the image is built
 #use the following variables to choose the version of hubble
-ENV HUBBLE_CHECKOUT=v2.2.7
-ENV HUBBLE_VERSION=2.2.7
+ENV HUBBLE_CHECKOUT=v2.2.8
+ENV HUBBLE_VERSION=2.2.8
 ENV HUBBLE_GIT_URL=https://github.com/hubblestack/hubble.git
 ENV HUBBLE_SRC_PATH=/hubble_src
 ENV _HOOK_DIR="./pkg/"