Skip to content

Commit

Permalink
cherrypicked commit from develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@MoodyMudit
MoodyMudit committed May 26, 2021
1 parent 20eaa4e commit 984856b
Show file tree
Hide file tree
Showing 14 changed files with 26 additions and 28 deletions.
4 changes: 2 additions & 2 deletions pkg/amazonlinux2016.09/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,11 +106,11 @@ RUN umask 022 \
&& curl -s -S -L "$PYENV_INSTALLER_URL" -o /usr/bin/pyenv-installer \
&& chmod 0755 /usr/bin/pyenv-installer \
&& /usr/bin/pyenv-installer \
&& eval "$(pyenv init -)" \
&& eval "$(pyenv init --path)" \
&& pyenv install $PYENV_VERSION \
&& pyenv global $PYENV_VERSION

RUN eval "$(pyenv init -)" \
RUN eval "$(pyenv init --path)" \
&& pip -v install --upgrade pip

#extract osquery files. optionally pass in osquery filename with OSQUERY_TAR_FILENAME build-arg
Expand Down
3 changes: 1 addition & 2 deletions pkg/centos7/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,10 +132,9 @@ RUN umask 022 \
&& curl -s -S -L "$PYENV_INSTALLER_URL" -o /usr/bin/pyenv-installer \
&& chmod 0755 /usr/bin/pyenv-installer \
&& /usr/bin/pyenv-installer \
&& eval "$(pyenv init -)" \
&& eval "$(pyenv init --path)" \
&& pyenv install --patch $PYENV_VERSION < /python_installation/python_patch_3.9.2.patch \
&& pyenv global $PYENV_VERSION

#extract osquery files. optionally pass in osquery filename with OSQUERY_TAR_FILENAME build-arg
ARG OSQUERY_TAR_FILENAME=osquery_4hubble.tar
ADD ${OSQUERY_TAR_FILENAME} /opt/osquery/
Expand Down
4 changes: 2 additions & 2 deletions pkg/centos8/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,11 +109,11 @@ RUN umask 022 \
&& curl -s -S -L "$PYENV_INSTALLER_URL" -o /usr/bin/pyenv-installer \
&& chmod 0755 /usr/bin/pyenv-installer \
&& /usr/bin/pyenv-installer \
&& eval "$(pyenv init -)" \
&& eval "$(pyenv init --path)" \
&& pyenv install $PYENV_VERSION \
&& pyenv global $PYENV_VERSION

RUN eval "$(pyenv init -)" \
RUN eval "$(pyenv init --path)" \
&& pip -v install --upgrade pip

#extract osquery files. optionally pass in osquery filename with OSQUERY_TAR_FILENAME build-arg
Expand Down
4 changes: 2 additions & 2 deletions pkg/coreos/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,11 +100,11 @@ RUN umask 022 \
&& curl -s -S -L "$PYENV_INSTALLER_URL" -o /usr/bin/pyenv-installer \
&& chmod 0755 /usr/bin/pyenv-installer \
&& /usr/bin/pyenv-installer \
&& eval "$(pyenv init -)" \
&& eval "$(pyenv init --path)" \
&& pyenv install $PYENV_VERSION \
&& pyenv global $PYENV_VERSION

RUN eval "$(pyenv init -)" \
RUN eval "$(pyenv init --path)" \
&& pip -v install --upgrade pip

#extract osquery files. optionally pass in osquery filename with OSQUERY_TAR_FILENAME build-arg
Expand Down
4 changes: 2 additions & 2 deletions pkg/debian10/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,11 +108,11 @@ RUN umask 022 \
&& curl -s -S -L "$PYENV_INSTALLER_URL" -o /usr/bin/pyenv-installer \
&& chmod 0755 /usr/bin/pyenv-installer \
&& /usr/bin/pyenv-installer \
&& eval "$(pyenv init -)" \
&& eval "$(pyenv init --path)" \
&& pyenv install $PYENV_VERSION \
&& pyenv global $PYENV_VERSION

RUN eval "$(pyenv init -)" \
RUN eval "$(pyenv init --path)" \
&& pip -v install --upgrade pip

#extract osquery files. optionally pass in osquery filename with OSQUERY_TAR_FILENAME build-arg
Expand Down
4 changes: 2 additions & 2 deletions pkg/debian8/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,11 +107,11 @@ RUN umask 022 \
&& curl -s -S -L "$PYENV_INSTALLER_URL" -o /usr/bin/pyenv-installer \
&& chmod 0755 /usr/bin/pyenv-installer \
&& /usr/bin/pyenv-installer \
&& eval "$(pyenv init -)" \
&& eval "$(pyenv init --path)" \
&& pyenv install $PYENV_VERSION \
&& pyenv global $PYENV_VERSION

RUN eval "$(pyenv init -)" \
RUN eval "$(pyenv init --path)" \
&& pip -v install --upgrade pip

#extract osquery files. optionally pass in osquery filename with OSQUERY_TAR_FILENAME build-arg
Expand Down
4 changes: 2 additions & 2 deletions pkg/debian9/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,11 +108,11 @@ RUN umask 022 \
&& curl -s -S -L "$PYENV_INSTALLER_URL" -o /usr/bin/pyenv-installer \
&& chmod 0755 /usr/bin/pyenv-installer \
&& /usr/bin/pyenv-installer \
&& eval "$(pyenv init -)" \
&& eval "$(pyenv init --path)" \
&& pyenv install $PYENV_VERSION \
&& pyenv global $PYENV_VERSION

RUN eval "$(pyenv init -)" \
RUN eval "$(pyenv init --path)" \
&& pip -v install --upgrade pip

#extract osquery files. optionally pass in osquery filename with OSQUERY_TAR_FILENAME build-arg
Expand Down
4 changes: 2 additions & 2 deletions pkg/dev/amazonlinux2016.09/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,11 +106,11 @@ RUN umask 022 \
&& curl -s -S -L "$PYENV_INSTALLER_URL" -o /usr/bin/pyenv-installer \
&& chmod 0755 /usr/bin/pyenv-installer \
&& /usr/bin/pyenv-installer \
&& eval "$(pyenv init -)" \
&& eval "$(pyenv init --path)" \
&& pyenv install $PYENV_VERSION \
&& pyenv global $PYENV_VERSION

RUN eval "$(pyenv init -)" \
RUN eval "$(pyenv init --path)" \
&& pip -v install --upgrade pip

#extract osquery files. optionally pass in osquery filename with OSQUERY_TAR_FILENAME build-arg
Expand Down
3 changes: 1 addition & 2 deletions pkg/dev/centos7/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,10 +127,9 @@ RUN umask 022 \
&& curl -s -S -L "$PYENV_INSTALLER_URL" -o /usr/bin/pyenv-installer \
&& chmod 0755 /usr/bin/pyenv-installer \
&& /usr/bin/pyenv-installer \
&& eval "$(pyenv init -)" \
&& eval "$(pyenv init --path)" \
&& pyenv install --patch $PYENV_VERSION < /python_installation/python_patch_3.9.2.patch \
&& pyenv global $PYENV_VERSION

#extract osquery files. optionally pass in osquery filename with OSQUERY_TAR_FILENAME build-arg
ARG OSQUERY_TAR_FILENAME=osquery_4hubble.tar
ADD ${OSQUERY_TAR_FILENAME} /opt/osquery/
Expand Down
4 changes: 2 additions & 2 deletions pkg/dev/centos8/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,11 +109,11 @@ RUN umask 022 \
&& curl -s -S -L "$PYENV_INSTALLER_URL" -o /usr/bin/pyenv-installer \
&& chmod 0755 /usr/bin/pyenv-installer \
&& /usr/bin/pyenv-installer \
&& eval "$(pyenv init -)" \
&& eval "$(pyenv init --path)" \
&& pyenv install $PYENV_VERSION \
&& pyenv global $PYENV_VERSION

RUN eval "$(pyenv init -)" \
RUN eval "$(pyenv init --path)" \
&& pip -v install --upgrade pip

#extract osquery files. optionally pass in osquery filename with OSQUERY_TAR_FILENAME build-arg
Expand Down
4 changes: 2 additions & 2 deletions pkg/dev/coreos/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,11 +100,11 @@ RUN umask 022 \
&& curl -s -S -L "$PYENV_INSTALLER_URL" -o /usr/bin/pyenv-installer \
&& chmod 0755 /usr/bin/pyenv-installer \
&& /usr/bin/pyenv-installer \
&& eval "$(pyenv init -)" \
&& eval "$(pyenv init --path)" \
&& pyenv install $PYENV_VERSION \
&& pyenv global $PYENV_VERSION

RUN eval "$(pyenv init -)" \
RUN eval "$(pyenv init --path)" \
&& pip -v install --upgrade pip

#extract osquery files. optionally pass in osquery filename with OSQUERY_TAR_FILENAME build-arg
Expand Down
4 changes: 2 additions & 2 deletions pkg/dev/debian10/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,11 +108,11 @@ RUN umask 022 \
&& curl -s -S -L "$PYENV_INSTALLER_URL" -o /usr/bin/pyenv-installer \
&& chmod 0755 /usr/bin/pyenv-installer \
&& /usr/bin/pyenv-installer \
&& eval "$(pyenv init -)" \
&& eval "$(pyenv init --path)" \
&& pyenv install $PYENV_VERSION \
&& pyenv global $PYENV_VERSION

RUN eval "$(pyenv init -)" \
RUN eval "$(pyenv init --path)" \
&& pip -v install --upgrade pip

#extract osquery files. optionally pass in osquery filename with OSQUERY_TAR_FILENAME build-arg
Expand Down
4 changes: 2 additions & 2 deletions pkg/dev/debian8/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,11 +107,11 @@ RUN umask 022 \
&& curl -s -S -L "$PYENV_INSTALLER_URL" -o /usr/bin/pyenv-installer \
&& chmod 0755 /usr/bin/pyenv-installer \
&& /usr/bin/pyenv-installer \
&& eval "$(pyenv init -)" \
&& eval "$(pyenv init --path)" \
&& pyenv install $PYENV_VERSION \
&& pyenv global $PYENV_VERSION

RUN eval "$(pyenv init -)" \
RUN eval "$(pyenv init --path)" \
&& pip -v install --upgrade pip

#extract osquery files. optionally pass in osquery filename with OSQUERY_TAR_FILENAME build-arg
Expand Down
4 changes: 2 additions & 2 deletions pkg/dev/debian9/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,11 +108,11 @@ RUN umask 022 \
&& curl -s -S -L "$PYENV_INSTALLER_URL" -o /usr/bin/pyenv-installer \
&& chmod 0755 /usr/bin/pyenv-installer \
&& /usr/bin/pyenv-installer \
&& eval "$(pyenv init -)" \
&& eval "$(pyenv init --path)" \
&& pyenv install $PYENV_VERSION \
&& pyenv global $PYENV_VERSION

RUN eval "$(pyenv init -)" \
RUN eval "$(pyenv init --path)" \
&& pip -v install --upgrade pip

#extract osquery files. optionally pass in osquery filename with OSQUERY_TAR_FILENAME build-arg
Expand Down

0 comments on commit 984856b

Please sign in to comment.