Skip to content

Commit 268f32a

Browse files
committed
bugs with the centos6 pyenv changes
1 parent 642922d commit 268f32a

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

pkg/centos6/Dockerfile

+4-3
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,9 @@ RUN eval "$(pyenv init -)" \
154154
&& pip -v install -r pyinstaller-requirements.txt
155155

156156
#fpm package making requirements start
157-
RUN yum install -y rpmbuild rpm-build gcc make rh-ruby23 rh-ruby23-ruby-devel \
158-
&& scl enable rh-ruby23 "gem install --no-ri --no-rdoc fpm"
157+
RUN yum install -y centos-release-scl scl-utils
158+
RUN yum install -y rpmbuild rpm-build gcc make rh-ruby23 rh-ruby23-ruby-devel
159+
RUN scl enable rh-ruby23 "gem install --no-ri --no-rdoc fpm"
159160

160161
#pyinstaller start
161162
#commands specified for ENTRYPOINT and CMD are executed when the container is run, not when the image is built
@@ -184,7 +185,7 @@ WORKDIR /hubble_build
184185
ENTRYPOINT [ "/bin/bash", "-o", "xtrace", "-c" ]
185186
CMD [ "if [ -f /data/hubble_buildinfo ] ; then echo \"\" >> /hubble_build/hubblestack/__init__.py ; cat /data/hubble_buildinfo >> /hubble_build/hubblestack/__init__.py; fi \
186187
&& eval \"$(pyenv init -)\" \
187-
&& python27 'pyinstaller --onedir --noconfirm --log-level ${_BINARY_LOG_LEVEL} --additional-hooks-dir=${_HOOK_DIR} --runtime-hook=pkg/pyinstaller-runtimehooks/pathopthubble.py hubble.py' \
188+
&& pyinstaller --onedir --noconfirm --log-level ${_BINARY_LOG_LEVEL} --additional-hooks-dir=${_HOOK_DIR} --runtime-hook=pkg/pyinstaller-runtimehooks/pathopthubble.py hubble.py \
188189
&& mkdir -p /var/log/hubble_osquery/backuplogs \
189190
# hubble default configuration file
190191
&& cp -rf /hubble_build/conf/hubble /etc/hubble/ \

0 commit comments

Comments
 (0)