Skip to content

Commit

Permalink
Merge pull request #462 from basepi/fixup2
Browse files Browse the repository at this point in the history
Rev to 2.4.5
  • Loading branch information
basepi authored Sep 21, 2018
2 parents 958075b + ecf5317 commit 91b33e7
Show file tree
Hide file tree
Showing 17 changed files with 25 additions and 25 deletions.
4 changes: 2 additions & 2 deletions doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion hubblestack/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '2.4.4'
__version__ = '2.4.5'
4 changes: 2 additions & 2 deletions pkg/amazonlinux2016.09/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions pkg/centos6/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions pkg/centos7/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions pkg/coreos/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/"
Expand Down
4 changes: 2 additions & 2 deletions pkg/debian7/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/"
Expand Down
4 changes: 2 additions & 2 deletions pkg/debian8/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/"
Expand Down
4 changes: 2 additions & 2 deletions pkg/debian9/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/"
Expand Down
2 changes: 1 addition & 1 deletion pkg/dev/amazonlinux2016.09/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/"
Expand Down
2 changes: 1 addition & 1 deletion pkg/dev/centos6/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/"
Expand Down
2 changes: 1 addition & 1 deletion pkg/dev/centos7/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/"
Expand Down
2 changes: 1 addition & 1 deletion pkg/dev/coreos/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/"
Expand Down
2 changes: 1 addition & 1 deletion pkg/dev/debian7/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/"
Expand Down
2 changes: 1 addition & 1 deletion pkg/dev/debian8/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/"
Expand Down
2 changes: 1 addition & 1 deletion pkg/dev/debian9/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/"
Expand Down
2 changes: 1 addition & 1 deletion pkg/windows/dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/'
Expand Down

0 comments on commit 91b33e7

Please sign in to comment.