From 83f624e7b939a166110c55f8ebabdea4af2cf2ee Mon Sep 17 00:00:00 2001 From: Yashvinder Singh Date: Tue, 18 Sep 2018 16:50:12 +0530 Subject: [PATCH 01/15] Update dockerfile --- pkg/windows/dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/windows/dockerfile b/pkg/windows/dockerfile index 02d95c618..b2154676d 100644 --- a/pkg/windows/dockerfile +++ b/pkg/windows/dockerfile @@ -54,7 +54,7 @@ RUN powershell.exe -Command pip install -r pyinstaller-requirements.txt; #Move portable git to a new location RUN powershell.exe -Command New-Item C:/temp/hubble/PortableGit -ItemType Directory; \ - Copy-Item -Path C:/tools/git -Destination C:/temp/hubble/PortableGit -Recurse; + Copy-Item -Path C:/tools/git/* -Destination C:/temp/hubble/PortableGit -Recurse; # Modify gitfs fix for incorrect path variables until fix has been upstreamed RUN powershell.exe -Command If (!(Test-Path C:/Python27/Lib/site-packages/salt)) {Copy-Item C:/temp/salt/salt -Destination C:/Python27/Lib/site-packages/ -Recurse -Force}; \ @@ -82,4 +82,4 @@ CMD powershell.exe -Command Push-Location C:/temp/hubble; \ #Build the installer Push-Location 'C:/Program Files (x86)/NSIS'; \ ./makensis.exe /DHubbleVersion="$env:HUBBLE_CHECKOUT" 'C:/temp/hubble/pkg/windows/hubble-Setup.nsi'; \ - Copy-Item C:/temp/hubble/pkg/windows/Hubble*exe -Destination C:/data/ \ No newline at end of file + Copy-Item C:/temp/hubble/pkg/windows/Hubble*exe -Destination C:/data/ From 5bff8910b8702461983996a3dce03420d2709ca3 Mon Sep 17 00:00:00 2001 From: Yashvinder Singh Date: Tue, 18 Sep 2018 17:03:42 +0530 Subject: [PATCH 02/15] Update dockerfile --- pkg/windows/dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/windows/dockerfile b/pkg/windows/dockerfile index b2154676d..46e9913cf 100644 --- a/pkg/windows/dockerfile +++ b/pkg/windows/dockerfile @@ -79,6 +79,7 @@ CMD powershell.exe -Command Push-Location C:/temp/hubble; \ Move-Item 'hubble/PortableGit' -Destination './hubble/dist/hubble/' -Force; \ Move-Item 'C:/ProgramData/chocolatey/lib/NSSM/tools/nssm.exe' -Destination './hubble/dist/hubble/' -Force; \ Move-Item 'C:/ProgramData/osquery/osqueryi.exe' -Destination './hubble/pkg/' -Force; \ + If (Test-Path C:/data/opt) {Copy-Item C:/data/opt -Destination './hubble/pkg/' -Recurse -Force}; #Build the installer Push-Location 'C:/Program Files (x86)/NSIS'; \ ./makensis.exe /DHubbleVersion="$env:HUBBLE_CHECKOUT" 'C:/temp/hubble/pkg/windows/hubble-Setup.nsi'; \ From 0283ec78dcbe9c41c47e43173861378408320b8e Mon Sep 17 00:00:00 2001 From: Yashvinder Singh Date: Tue, 18 Sep 2018 17:05:55 +0530 Subject: [PATCH 03/15] Update dockerfile --- pkg/windows/dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/windows/dockerfile b/pkg/windows/dockerfile index 46e9913cf..70b0da743 100644 --- a/pkg/windows/dockerfile +++ b/pkg/windows/dockerfile @@ -79,7 +79,8 @@ CMD powershell.exe -Command Push-Location C:/temp/hubble; \ Move-Item 'hubble/PortableGit' -Destination './hubble/dist/hubble/' -Force; \ Move-Item 'C:/ProgramData/chocolatey/lib/NSSM/tools/nssm.exe' -Destination './hubble/dist/hubble/' -Force; \ Move-Item 'C:/ProgramData/osquery/osqueryi.exe' -Destination './hubble/pkg/' -Force; \ - If (Test-Path C:/data/opt) {Copy-Item C:/data/opt -Destination './hubble/pkg/' -Recurse -Force}; + If (Test-Path C:/data/hubble.conf) {Copy-Item C:/data/hubble.conf -Destination ./hubble/dist/hubble/etc/hubble/ -Force}; \ + If (Test-Path C:/data/opt) {Copy-Item C:/data/opt -Destination './hubble/pkg/' -Recurse -Force}; \ #Build the installer Push-Location 'C:/Program Files (x86)/NSIS'; \ ./makensis.exe /DHubbleVersion="$env:HUBBLE_CHECKOUT" 'C:/temp/hubble/pkg/windows/hubble-Setup.nsi'; \ From 1661f42da0a095871b6dfed5b58a1e3ea3a58d5b Mon Sep 17 00:00:00 2001 From: Yashvinder Singh Date: Tue, 18 Sep 2018 18:57:05 +0530 Subject: [PATCH 04/15] Update dockerfile --- pkg/windows/dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/windows/dockerfile b/pkg/windows/dockerfile index 70b0da743..655daf777 100644 --- a/pkg/windows/dockerfile +++ b/pkg/windows/dockerfile @@ -80,7 +80,7 @@ CMD powershell.exe -Command Push-Location C:/temp/hubble; \ Move-Item 'C:/ProgramData/chocolatey/lib/NSSM/tools/nssm.exe' -Destination './hubble/dist/hubble/' -Force; \ Move-Item 'C:/ProgramData/osquery/osqueryi.exe' -Destination './hubble/pkg/' -Force; \ If (Test-Path C:/data/hubble.conf) {Copy-Item C:/data/hubble.conf -Destination ./hubble/dist/hubble/etc/hubble/ -Force}; \ - If (Test-Path C:/data/opt) {Copy-Item C:/data/opt -Destination './hubble/pkg/' -Recurse -Force}; \ + If (Test-Path C:/data/opt) {Copy-Item C:/data/opt -Destination './hubble/dist/hubble/' -Recurse -Force}; \ #Build the installer Push-Location 'C:/Program Files (x86)/NSIS'; \ ./makensis.exe /DHubbleVersion="$env:HUBBLE_CHECKOUT" 'C:/temp/hubble/pkg/windows/hubble-Setup.nsi'; \ From f66d7d9f6cb69518a159f03f306c885c7f69f031 Mon Sep 17 00:00:00 2001 From: Yashvinder Singh Date: Tue, 18 Sep 2018 19:10:05 +0530 Subject: [PATCH 05/15] Update dockerfile --- pkg/windows/dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkg/windows/dockerfile b/pkg/windows/dockerfile index 655daf777..2c82f4052 100644 --- a/pkg/windows/dockerfile +++ b/pkg/windows/dockerfile @@ -84,4 +84,7 @@ CMD powershell.exe -Command Push-Location C:/temp/hubble; \ #Build the installer Push-Location 'C:/Program Files (x86)/NSIS'; \ ./makensis.exe /DHubbleVersion="$env:HUBBLE_CHECKOUT" 'C:/temp/hubble/pkg/windows/hubble-Setup.nsi'; \ - Copy-Item C:/temp/hubble/pkg/windows/Hubble*exe -Destination C:/data/ + Get-FileHash -Path C:/temp/hubble/pkg/windows/Hubble*exe -Algorithm SHA256 | Select Hash > hubble_windows.sha256; \ + Copy-Item C:/temp/hubble/pkg/windows/Hubble*exe -Destination C:/data/; \ + Copy-Item C:/temp/hubble/pkg/windows/hubble_windows.sha256 -Destination C:/data/; + From 318312fe83df23715dd16304bc7f55f619d47417 Mon Sep 17 00:00:00 2001 From: Yashvinder Singh Date: Tue, 18 Sep 2018 19:13:15 +0530 Subject: [PATCH 06/15] Update dockerfile --- pkg/windows/dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/windows/dockerfile b/pkg/windows/dockerfile index 2c82f4052..f01b45e93 100644 --- a/pkg/windows/dockerfile +++ b/pkg/windows/dockerfile @@ -84,7 +84,7 @@ CMD powershell.exe -Command Push-Location C:/temp/hubble; \ #Build the installer Push-Location 'C:/Program Files (x86)/NSIS'; \ ./makensis.exe /DHubbleVersion="$env:HUBBLE_CHECKOUT" 'C:/temp/hubble/pkg/windows/hubble-Setup.nsi'; \ - Get-FileHash -Path C:/temp/hubble/pkg/windows/Hubble*exe -Algorithm SHA256 | Select Hash > hubble_windows.sha256; \ + Get-FileHash -Path C:/temp/hubble/pkg/windows/Hubble*exe -Algorithm SHA256 > hubble_windows.sha256; \ Copy-Item C:/temp/hubble/pkg/windows/Hubble*exe -Destination C:/data/; \ Copy-Item C:/temp/hubble/pkg/windows/hubble_windows.sha256 -Destination C:/data/; From 53f8365de847d93da5db250add01d020b45761ad Mon Sep 17 00:00:00 2001 From: Yashvinder Singh Date: Tue, 18 Sep 2018 19:39:27 +0530 Subject: [PATCH 07/15] Update dockerfile --- pkg/windows/dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/windows/dockerfile b/pkg/windows/dockerfile index f01b45e93..ba40f1c6c 100644 --- a/pkg/windows/dockerfile +++ b/pkg/windows/dockerfile @@ -15,7 +15,7 @@ ENV SALT_SRC_PATH='C:/temp/salt/' ENV SALT_GIT_URL=https://github.com/saltstack/salt ENV SALT_CHECKOUT=v2018.3.0 #All the variables used for hubble -ENV HUBBLE_CHECKOUT=v2.2.4-2 +ENV HUBBLE_CHECKOUT=v2.4.4 ENV HUBBLE_GIT_URL=https://github.com/hubblestack/hubble.git ENV HUBBLE_SRC_PATH='C:/temp/hubble/' ENV _HOOK_DIR='./pkg/' @@ -84,7 +84,7 @@ CMD powershell.exe -Command Push-Location C:/temp/hubble; \ #Build the installer Push-Location 'C:/Program Files (x86)/NSIS'; \ ./makensis.exe /DHubbleVersion="$env:HUBBLE_CHECKOUT" 'C:/temp/hubble/pkg/windows/hubble-Setup.nsi'; \ - Get-FileHash -Path C:/temp/hubble/pkg/windows/Hubble*exe -Algorithm SHA256 > hubble_windows.sha256; \ + Get-FileHash -Path C:/temp/hubble/pkg/windows/Hubble*exe -Algorithm SHA256 > C:/temp/hubble/pkg/windows/hubble_windows.sha256; \ Copy-Item C:/temp/hubble/pkg/windows/Hubble*exe -Destination C:/data/; \ Copy-Item C:/temp/hubble/pkg/windows/hubble_windows.sha256 -Destination C:/data/; From 73cdeb3e116f08383cf75149c3190ab73e4e5fdc Mon Sep 17 00:00:00 2001 From: Yashvinder Singh Date: Tue, 18 Sep 2018 19:57:43 +0530 Subject: [PATCH 08/15] Update dockerfile --- pkg/windows/dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/windows/dockerfile b/pkg/windows/dockerfile index ba40f1c6c..36bc3390d 100644 --- a/pkg/windows/dockerfile +++ b/pkg/windows/dockerfile @@ -84,7 +84,7 @@ CMD powershell.exe -Command Push-Location C:/temp/hubble; \ #Build the installer Push-Location 'C:/Program Files (x86)/NSIS'; \ ./makensis.exe /DHubbleVersion="$env:HUBBLE_CHECKOUT" 'C:/temp/hubble/pkg/windows/hubble-Setup.nsi'; \ - Get-FileHash -Path C:/temp/hubble/pkg/windows/Hubble*exe -Algorithm SHA256 > C:/temp/hubble/pkg/windows/hubble_windows.sha256; \ + Get-FileHash -Path C:/temp/hubble/pkg/windows/Hubble*exe -Algorithm SHA256 | Out-File C:/temp/hubble/pkg/windows/hubble_windows.sha256; \ Copy-Item C:/temp/hubble/pkg/windows/Hubble*exe -Destination C:/data/; \ Copy-Item C:/temp/hubble/pkg/windows/hubble_windows.sha256 -Destination C:/data/; From 48a93cc69f33895c5f060aa737b6ca17cd644aea Mon Sep 17 00:00:00 2001 From: Yashvinder Singh Date: Tue, 18 Sep 2018 20:08:10 +0530 Subject: [PATCH 09/15] Update dockerfile --- pkg/windows/dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/windows/dockerfile b/pkg/windows/dockerfile index 36bc3390d..75a4dd9c4 100644 --- a/pkg/windows/dockerfile +++ b/pkg/windows/dockerfile @@ -13,7 +13,7 @@ ENV CHOCO_URL=https://chocolatey.org/install.ps1 #All the variables used for salt ENV SALT_SRC_PATH='C:/temp/salt/' ENV SALT_GIT_URL=https://github.com/saltstack/salt -ENV SALT_CHECKOUT=v2018.3.0 +ENV SALT_CHECKOUT=v2018.11 #All the variables used for hubble ENV HUBBLE_CHECKOUT=v2.4.4 ENV HUBBLE_GIT_URL=https://github.com/hubblestack/hubble.git From 3a18953f5b26de70239b13f6cc6fa7931368cf2b Mon Sep 17 00:00:00 2001 From: Yashvinder Singh Date: Wed, 19 Sep 2018 11:49:08 +0530 Subject: [PATCH 10/15] Update dockerfile --- pkg/windows/dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/windows/dockerfile b/pkg/windows/dockerfile index 75a4dd9c4..ee7adaa93 100644 --- a/pkg/windows/dockerfile +++ b/pkg/windows/dockerfile @@ -84,7 +84,7 @@ CMD powershell.exe -Command Push-Location C:/temp/hubble; \ #Build the installer Push-Location 'C:/Program Files (x86)/NSIS'; \ ./makensis.exe /DHubbleVersion="$env:HUBBLE_CHECKOUT" 'C:/temp/hubble/pkg/windows/hubble-Setup.nsi'; \ - Get-FileHash -Path C:/temp/hubble/pkg/windows/Hubble*exe -Algorithm SHA256 | Out-File C:/temp/hubble/pkg/windows/hubble_windows.sha256; \ + Get-FileHash -Path C:/temp/hubble/pkg/windows/Hubble*exe -Algorithm SHA256 ^| Out-File C:/temp/hubble/pkg/windows/hubble_windows.sha256; \ Copy-Item C:/temp/hubble/pkg/windows/Hubble*exe -Destination C:/data/; \ Copy-Item C:/temp/hubble/pkg/windows/hubble_windows.sha256 -Destination C:/data/; From 5a13144d227b477505ca40ae72b10d1b927f3e3d Mon Sep 17 00:00:00 2001 From: Paul Miller Date: Wed, 19 Sep 2018 15:51:37 -0400 Subject: [PATCH 11/15] disable @hangtime_wrapper() and defang HangTime if signals.SIGALRM is missing (windows) --- hubblestack/hangtime/__init__.py | 11 +++++++ hubblestack/hangtime/fake.py | 33 +++++++++++++++++++ .../linux_itimers.py} | 0 3 files changed, 44 insertions(+) create mode 100644 hubblestack/hangtime/__init__.py create mode 100644 hubblestack/hangtime/fake.py rename hubblestack/{hangtime.py => hangtime/linux_itimers.py} (100%) diff --git a/hubblestack/hangtime/__init__.py b/hubblestack/hangtime/__init__.py new file mode 100644 index 000000000..064dbd557 --- /dev/null +++ b/hubblestack/hangtime/__init__.py @@ -0,0 +1,11 @@ +try: + import signal + + # windows (et al?) has no concept of signal.SIGALRM force the issue here + # and, if applicable, load a fake timer wrapper + + assert signal.SIGALRM > 0 + from linux_itimers import HangTime, hangtime_wrapper + +except: + from fake import HangTime, hangtime_wrapper diff --git a/hubblestack/hangtime/fake.py b/hubblestack/hangtime/fake.py new file mode 100644 index 000000000..f5b7c332b --- /dev/null +++ b/hubblestack/hangtime/fake.py @@ -0,0 +1,33 @@ +# -*- coding: utf-8 -*- +''' +Defanged fake timer setup that pretends to do all the things HangTime would do +(by arguments); but actually does nothing at all. + +The decorator in particular doesn't even attempt to load the HangTime wrapper +around code. +''' + +class HangTime(object): + def __init__(self, msg="hang timeout detected", timeout=300, tag=None, repeats=False, decay=1.0): + pass + + def __repr__(self): + return "FakeHT({:0.2f}s, tag={})".format(self.timeout, self.tag) + + def restore(self, ended=False): + pass + + def fire_timer(self, *sig_param): + pass + + def __enter__(self): + return self + + def __exit__(self, e_type, e_obj, e_tb): + pass + + +def hangtime_wrapper(**ht_kw): + def _decorator(actual): + return actual + return _decorator diff --git a/hubblestack/hangtime.py b/hubblestack/hangtime/linux_itimers.py similarity index 100% rename from hubblestack/hangtime.py rename to hubblestack/hangtime/linux_itimers.py From d70b6d70723e81a73ee3d6a3c23bc4e1ca4784d6 Mon Sep 17 00:00:00 2001 From: Yashvinder Singh Date: Thu, 20 Sep 2018 19:30:10 +0530 Subject: [PATCH 12/15] Update dockerfile --- pkg/windows/dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/windows/dockerfile b/pkg/windows/dockerfile index ee7adaa93..1a5d860d5 100644 --- a/pkg/windows/dockerfile +++ b/pkg/windows/dockerfile @@ -3,8 +3,10 @@ # To build an image: 1. copy pkg/windows/pyinstaller-requirements.txt & to directory with this Dockerfile # 2. docker build -t . # The resulting image is ready to run the pyinstaller on container start and drop hubble.exe -# in a local directory. Mount /data volume into a directory on the host to access the package. -# To run the container: docker run -it --rm -v :c:\data +# in a local directory. Mount c:\data volume into a directory on the host to access the package. +# To run the container: +# 3. Copy over any other items you want to include with hubble and place them in /opt +# 4. docker run -it --rm -v :c:\data #build docker image from windowscore FROM microsoft/windowsservercore #Needed to just work From 9724cbfbd9f86f86372db97a890030de19618150 Mon Sep 17 00:00:00 2001 From: Yashvinder Singh Date: Thu, 20 Sep 2018 19:59:55 +0530 Subject: [PATCH 13/15] Update dockerfile --- pkg/windows/dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/windows/dockerfile b/pkg/windows/dockerfile index 1a5d860d5..26cf30529 100644 --- a/pkg/windows/dockerfile +++ b/pkg/windows/dockerfile @@ -56,7 +56,7 @@ RUN powershell.exe -Command pip install -r pyinstaller-requirements.txt; #Move portable git to a new location RUN powershell.exe -Command New-Item C:/temp/hubble/PortableGit -ItemType Directory; \ - Copy-Item -Path C:/tools/git/* -Destination C:/temp/hubble/PortableGit -Recurse; + Copy-Item -Path C:/tools/git/* -Destination C:/temp/hubble/PortableGit/ -Recurse; # Modify gitfs fix for incorrect path variables until fix has been upstreamed RUN powershell.exe -Command If (!(Test-Path C:/Python27/Lib/site-packages/salt)) {Copy-Item C:/temp/salt/salt -Destination C:/Python27/Lib/site-packages/ -Recurse -Force}; \ From f16a1fc2ee97966e9860056405f122e1c5793cf1 Mon Sep 17 00:00:00 2001 From: Yashvinder Singh Date: Fri, 21 Sep 2018 14:32:55 +0530 Subject: [PATCH 14/15] Update dockerfile --- pkg/windows/dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/windows/dockerfile b/pkg/windows/dockerfile index 26cf30529..c9e3ed4ba 100644 --- a/pkg/windows/dockerfile +++ b/pkg/windows/dockerfile @@ -80,7 +80,7 @@ CMD powershell.exe -Command Push-Location C:/temp/hubble; \ Move-Item hubble.conf -Destination ./hubble/dist/hubble/etc/hubble/; \ Move-Item 'hubble/PortableGit' -Destination './hubble/dist/hubble/' -Force; \ Move-Item 'C:/ProgramData/chocolatey/lib/NSSM/tools/nssm.exe' -Destination './hubble/dist/hubble/' -Force; \ - Move-Item 'C:/ProgramData/osquery/osqueryi.exe' -Destination './hubble/pkg/' -Force; \ + Move-Item 'C:/ProgramData/osquery/osqueryi.exe' -Destination './hubble/dist/hubble/' -Force; \ If (Test-Path C:/data/hubble.conf) {Copy-Item C:/data/hubble.conf -Destination ./hubble/dist/hubble/etc/hubble/ -Force}; \ If (Test-Path C:/data/opt) {Copy-Item C:/data/opt -Destination './hubble/dist/hubble/' -Recurse -Force}; \ #Build the installer From ecf5317d69353b09a79bbe75663e344eea5a0157 Mon Sep 17 00:00:00 2001 From: Colton Myers Date: Fri, 21 Sep 2018 11:14:32 -0600 Subject: [PATCH 15/15] Rev to 2.4.5 --- doc/conf.py | 4 ++-- hubblestack/__init__.py | 2 +- pkg/amazonlinux2016.09/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 ++-- pkg/dev/amazonlinux2016.09/Dockerfile | 2 +- pkg/dev/centos6/Dockerfile | 2 +- pkg/dev/centos7/Dockerfile | 2 +- pkg/dev/coreos/Dockerfile | 2 +- pkg/dev/debian7/Dockerfile | 2 +- pkg/dev/debian8/Dockerfile | 2 +- pkg/dev/debian9/Dockerfile | 2 +- pkg/windows/dockerfile | 2 +- 17 files changed, 25 insertions(+), 25 deletions(-) diff --git a/doc/conf.py b/doc/conf.py index e19990c26..a8818ec15 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -59,9 +59,9 @@ # built documents. # # The short X.Y version. -version = u'2.4.4' +version = u'2.4.5' # The full version, including alpha/beta/rc tags. -release = u'2.4.4-1' +release = u'2.4.5-1' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/hubblestack/__init__.py b/hubblestack/__init__.py index 0d6ef5fbd..25cb3b498 100644 --- a/hubblestack/__init__.py +++ b/hubblestack/__init__.py @@ -1 +1 @@ -__version__ = '2.4.4' +__version__ = '2.4.5' diff --git a/pkg/amazonlinux2016.09/Dockerfile b/pkg/amazonlinux2016.09/Dockerfile index a27444431..c8fc89d0d 100644 --- a/pkg/amazonlinux2016.09/Dockerfile +++ b/pkg/amazonlinux2016.09/Dockerfile @@ -125,8 +125,8 @@ RUN yum install -y ruby ruby-devel rpmbuild rpm-build 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.4.4 -ENV HUBBLE_VERSION=2.4.4 +ENV HUBBLE_CHECKOUT=v2.4.5 +ENV HUBBLE_VERSION=2.4.5 ENV HUBBLE_ITERATION=1 ENV HUBBLE_GIT_URL=https://github.com/hubblestack/hubble.git ENV HUBBLE_SRC_PATH=/hubble_src diff --git a/pkg/centos6/Dockerfile b/pkg/centos6/Dockerfile index 292f1cd36..1e5dc4b8a 100644 --- a/pkg/centos6/Dockerfile +++ b/pkg/centos6/Dockerfile @@ -127,8 +127,8 @@ RUN yum install -y rpmbuild rpm-build 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.4.4 -ENV HUBBLE_VERSION=2.4.4 +ENV HUBBLE_CHECKOUT=v2.4.5 +ENV HUBBLE_VERSION=2.4.5 ENV HUBBLE_ITERATION=1 ENV HUBBLE_GIT_URL=https://github.com/hubblestack/hubble.git ENV HUBBLE_SRC_PATH=/hubble_src diff --git a/pkg/centos7/Dockerfile b/pkg/centos7/Dockerfile index a9a3f66c3..1f06863f4 100644 --- a/pkg/centos7/Dockerfile +++ b/pkg/centos7/Dockerfile @@ -124,8 +124,8 @@ RUN yum install -y ruby ruby-devel rpmbuild rpm-build 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.4.4 -ENV HUBBLE_VERSION=2.4.4 +ENV HUBBLE_CHECKOUT=v2.4.5 +ENV HUBBLE_VERSION=2.4.5 ENV HUBBLE_ITERATION=1 ENV HUBBLE_GIT_URL=https://github.com/hubblestack/hubble.git ENV HUBBLE_SRC_PATH=/hubble_src diff --git a/pkg/coreos/Dockerfile b/pkg/coreos/Dockerfile index 807133761..6a29b258e 100644 --- a/pkg/coreos/Dockerfile +++ b/pkg/coreos/Dockerfile @@ -136,9 +136,9 @@ RUN pip -v install -r pyinstaller-requirements.txt #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.4.4 +ENV HUBBLE_CHECKOUT=v2.4.5 ENV HUBBLE_GIT_URL=https://github.com/hubblestack/hubble.git -ENV HUBBLE_VERSION=2.4.4 +ENV HUBBLE_VERSION=2.4.5 ENV HUBBLE_ITERATION=1 ENV HUBBLE_SRC_PATH=/hubble_src ENV _HOOK_DIR="./pkg/" diff --git a/pkg/debian7/Dockerfile b/pkg/debian7/Dockerfile index 5941b4a96..430287931 100644 --- a/pkg/debian7/Dockerfile +++ b/pkg/debian7/Dockerfile @@ -163,9 +163,9 @@ 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.4.4 +ENV HUBBLE_CHECKOUT=v2.4.5 ENV HUBBLE_GIT_URL=https://github.com/hubblestack/hubble.git -ENV HUBBLE_VERSION=2.4.4 +ENV HUBBLE_VERSION=2.4.5 ENV HUBBLE_ITERATION=1 ENV HUBBLE_SRC_PATH=/hubble_src ENV _HOOK_DIR="./pkg/" diff --git a/pkg/debian8/Dockerfile b/pkg/debian8/Dockerfile index 463b59265..61d40f7f1 100644 --- a/pkg/debian8/Dockerfile +++ b/pkg/debian8/Dockerfile @@ -145,9 +145,9 @@ 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.4.4 +ENV HUBBLE_CHECKOUT=v2.4.5 ENV HUBBLE_GIT_URL=https://github.com/hubblestack/hubble.git -ENV HUBBLE_VERSION=2.4.4 +ENV HUBBLE_VERSION=2.4.5 ENV HUBBLE_ITERATION=1 ENV HUBBLE_SRC_PATH=/hubble_src ENV _HOOK_DIR="./pkg/" diff --git a/pkg/debian9/Dockerfile b/pkg/debian9/Dockerfile index beb27c25f..2a6fc6f9e 100644 --- a/pkg/debian9/Dockerfile +++ b/pkg/debian9/Dockerfile @@ -140,9 +140,9 @@ 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.4.4 +ENV HUBBLE_CHECKOUT=v2.4.5 ENV HUBBLE_GIT_URL=https://github.com/hubblestack/hubble.git -ENV HUBBLE_VERSION=2.4.4 +ENV HUBBLE_VERSION=2.4.5 ENV HUBBLE_ITERATION=1 ENV HUBBLE_SRC_PATH=/hubble_src ENV _HOOK_DIR="./pkg/" diff --git a/pkg/dev/amazonlinux2016.09/Dockerfile b/pkg/dev/amazonlinux2016.09/Dockerfile index 487998834..1581dd37d 100644 --- a/pkg/dev/amazonlinux2016.09/Dockerfile +++ b/pkg/dev/amazonlinux2016.09/Dockerfile @@ -128,7 +128,7 @@ RUN yum install -y ruby ruby-devel rpmbuild rpm-build rubygems gcc make \ #use the following variables to choose the version of hubble ARG HUBBLE_CHECKOUT=develop ARG HUBBLE_GIT_URL=https://github.com/hubblestack/hubble.git -ENV HUBBLE_VERSION=2.4.4_develop +ENV HUBBLE_VERSION=2.4.5_develop ENV HUBBLE_ITERATION=1 ENV HUBBLE_SRC_PATH=/hubble_src ENV _HOOK_DIR="./pkg/" diff --git a/pkg/dev/centos6/Dockerfile b/pkg/dev/centos6/Dockerfile index 6c58382d3..ea3b7ed04 100644 --- a/pkg/dev/centos6/Dockerfile +++ b/pkg/dev/centos6/Dockerfile @@ -130,7 +130,7 @@ RUN yum install -y rpmbuild rpm-build gcc make rh-ruby23 rh-ruby23-ruby-devel \ #use the following variables to choose the version of hubble ARG HUBBLE_CHECKOUT=develop ARG HUBBLE_GIT_URL=https://github.com/hubblestack/hubble.git -ENV HUBBLE_VERSION=2.4.4_develop +ENV HUBBLE_VERSION=2.4.5_develop ENV HUBBLE_ITERATION=1 ENV HUBBLE_SRC_PATH=/hubble_src ENV _HOOK_DIR="./pkg/" diff --git a/pkg/dev/centos7/Dockerfile b/pkg/dev/centos7/Dockerfile index 04d67226a..1db47db30 100644 --- a/pkg/dev/centos7/Dockerfile +++ b/pkg/dev/centos7/Dockerfile @@ -127,7 +127,7 @@ RUN yum install -y ruby ruby-devel rpmbuild rpm-build rubygems gcc make \ #use the following variables to choose the version of hubble ARG HUBBLE_CHECKOUT=develop ARG HUBBLE_GIT_URL=https://github.com/hubblestack/hubble.git -ENV HUBBLE_VERSION=2.4.4_develop +ENV HUBBLE_VERSION=2.4.5_develop ENV HUBBLE_ITERATION=1 ENV HUBBLE_SRC_PATH=/hubble_src ENV _HOOK_DIR="./pkg/" diff --git a/pkg/dev/coreos/Dockerfile b/pkg/dev/coreos/Dockerfile index 1e9852548..37f6c1fc7 100644 --- a/pkg/dev/coreos/Dockerfile +++ b/pkg/dev/coreos/Dockerfile @@ -139,7 +139,7 @@ RUN pip -v install -r pyinstaller-requirements.txt #use the following variables to choose the version of hubble ARG HUBBLE_CHECKOUT=develop ARG HUBBLE_GIT_URL=https://github.com/hubblestack/hubble.git -ENV HUBBLE_VERSION=2.4.4_develop +ENV HUBBLE_VERSION=2.4.5_develop ENV HUBBLE_ITERATION=1 ENV HUBBLE_SRC_PATH=/hubble_src ENV _HOOK_DIR="./pkg/" diff --git a/pkg/dev/debian7/Dockerfile b/pkg/dev/debian7/Dockerfile index 290b2e2c2..49cca71fc 100644 --- a/pkg/dev/debian7/Dockerfile +++ b/pkg/dev/debian7/Dockerfile @@ -166,7 +166,7 @@ RUN apt-get install -y ruby ruby-dev rubygems gcc make \ #use the following variables to choose the version of hubble ARG HUBBLE_CHECKOUT=develop ARG HUBBLE_GIT_URL=https://github.com/hubblestack/hubble.git -ENV HUBBLE_VERSION=2.4.4_develop +ENV HUBBLE_VERSION=2.4.5_develop ENV HUBBLE_ITERATION=1 ENV HUBBLE_SRC_PATH=/hubble_src ENV _HOOK_DIR="./pkg/" diff --git a/pkg/dev/debian8/Dockerfile b/pkg/dev/debian8/Dockerfile index 63d947395..b4648dd34 100644 --- a/pkg/dev/debian8/Dockerfile +++ b/pkg/dev/debian8/Dockerfile @@ -148,7 +148,7 @@ RUN apt-get install -y ruby ruby-dev rubygems gcc make \ #use the following variables to choose the version of hubble ARG HUBBLE_CHECKOUT=develop ARG HUBBLE_GIT_URL=https://github.com/hubblestack/hubble.git -ENV HUBBLE_VERSION=2.4.4_develop +ENV HUBBLE_VERSION=2.4.5_develop ENV HUBBLE_ITERATION=1 ENV HUBBLE_SRC_PATH=/hubble_src ENV _HOOK_DIR="./pkg/" diff --git a/pkg/dev/debian9/Dockerfile b/pkg/dev/debian9/Dockerfile index 47f2cd1a5..c4c87de8b 100644 --- a/pkg/dev/debian9/Dockerfile +++ b/pkg/dev/debian9/Dockerfile @@ -143,7 +143,7 @@ RUN apt-get install -y ruby ruby-dev rubygems gcc make \ #use the following variables to choose the version of hubble ARG HUBBLE_CHECKOUT=develop ARG HUBBLE_GIT_URL=https://github.com/hubblestack/hubble.git -ENV HUBBLE_VERSION=2.4.4_develop +ENV HUBBLE_VERSION=2.4.5_develop ENV HUBBLE_ITERATION=1 ENV HUBBLE_SRC_PATH=/hubble_src ENV _HOOK_DIR="./pkg/" diff --git a/pkg/windows/dockerfile b/pkg/windows/dockerfile index c9e3ed4ba..741239108 100644 --- a/pkg/windows/dockerfile +++ b/pkg/windows/dockerfile @@ -17,7 +17,7 @@ ENV SALT_SRC_PATH='C:/temp/salt/' ENV SALT_GIT_URL=https://github.com/saltstack/salt ENV SALT_CHECKOUT=v2018.11 #All the variables used for hubble -ENV HUBBLE_CHECKOUT=v2.4.4 +ENV HUBBLE_CHECKOUT=v2.4.5 ENV HUBBLE_GIT_URL=https://github.com/hubblestack/hubble.git ENV HUBBLE_SRC_PATH='C:/temp/hubble/' ENV _HOOK_DIR='./pkg/'