From bf89a489aa53cef667894348da6e3caeb69f4c13 Mon Sep 17 00:00:00 2001 From: Colton Myers Date: Mon, 2 Oct 2017 13:41:10 -0600 Subject: [PATCH 1/2] Add hash cache invalidation to azurefs --- hubblestack/extmods/fileserver/azurefs.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hubblestack/extmods/fileserver/azurefs.py b/hubblestack/extmods/fileserver/azurefs.py index 60ef5339e..672ad6771 100644 --- 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): From e3ef7cf880e1f4cf697a620a5e524fb81a315634 Mon Sep 17 00:00:00 2001 From: Colton Myers Date: Wed, 4 Oct 2017 10:28:01 -0600 Subject: [PATCH 2/2] Rev to v2.2.8 --- hubblestack/__init__.py | 2 +- pkg/amazonlinux2016.09/Dockerfile | 4 ++-- pkg/amazonlinux2017.03/Dockerfile | 4 ++-- pkg/centos6/Dockerfile | 4 ++-- pkg/centos7/Dockerfile | 4 ++-- pkg/coreos/Dockerfile | 4 ++-- pkg/debian7/Dockerfile | 4 ++-- pkg/debian8/Dockerfile | 4 ++-- pkg/debian9/Dockerfile | 4 ++-- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/hubblestack/__init__.py b/hubblestack/__init__.py index 04e669086..bc570f207 100644 --- a/hubblestack/__init__.py +++ b/hubblestack/__init__.py @@ -1 +1 @@ -__version__ = '2.2.7' +__version__ = '2.2.8' diff --git a/pkg/amazonlinux2016.09/Dockerfile b/pkg/amazonlinux2016.09/Dockerfile index 9a7c42479..4a523696f 100644 --- 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 index 0e7dcb2d9..acbdcfe3f 100644 --- 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 index 0f473977a..d717c36ad 100644 --- 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 index 550bf5941..cd8f7b16e 100644 --- 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 index 0ab349910..a91578203 100644 --- 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 index e0feeb91f..51771c522 100644 --- 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 index 0af385d68..cb21e5a6d 100644 --- 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 index 6cf11ec92..c6aa70fe7 100644 --- 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/"