Skip to content

Commit 6d965a4

Browse files
jetterojettero
authored
Merge pull request #835 from jettero/4.0-minor-fixes
4.0 minor fixes
2 parents 6d87060 + 402ed28 commit 6d965a4

23 files changed

+63
-62
lines changed

‎pkg/centos6/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ RUN yum install -y rpmbuild rpm-build gcc make rh-ruby23 rh-ruby23-ruby-devel
140140
RUN scl enable rh-ruby23 "gem install --no-ri --no-rdoc fpm"
141141

142142
# things we may need to build a python
143-
RUN yum install -y bzip2-devel
143+
RUN yum install -y bzip2-devel sqlite-devel
144144

145145
# use pyenv
146146
ARG PYENV_VERSION=3.6.10

‎pkg/centos6/entrypoint.sh

+6-6
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,11 @@ cp -va /entrypoint.sh /data/last-build.1
6565

6666
mkdir -p /var/log/hubble_osquery/backuplogs
6767

68-
mkdir -p /usr/lib/systemd/system
68+
mkdir -p /etc/init.d
6969
mkdir -p /etc/profile.d
7070
mkdir -p /etc/hubble
7171

72-
cp -v /hubble_build/pkg/hubble.service /usr/lib/systemd/system/
72+
cp -v /hubble_build/pkg/hubble /etc/init.d
7373
cp -v /hubble_build/conf/hubble-profile.sh /etc/profile.d/
7474

7575
if [ -f /data/hubble ]
@@ -102,7 +102,7 @@ tar -cSPvvzf /data/hubblestack-${HUBBLE_VERSION}.tar.gz \
102102
--exclude opt/hubble/pyenv \
103103
/etc/hubble /opt/hubble /opt/osquery \
104104
/etc/profile.d/hubble-profile.sh \
105-
/usr/lib/systemd/system/hubble.service \
105+
/etc/init.d/hubble \
106106
/var/log/hubble_osquery/backuplogs \
107107
2>&1 | tee /hubble_build/rpm-pkg-start-tar.log
108108

@@ -133,10 +133,10 @@ scl enable rh-ruby23 'fpm -s dir -t rpm \
133133
--url ${HUBBLE_URL} \
134134
--description "${HUBBLE_DESCRIPTION}" \
135135
--rpm-summary "${HUBBLE_SUMMARY}" \
136-
--after-install /hubble_build/conf/afterinstall-systemd.sh \
137-
--after-upgrade /hubble_build/conf/afterupgrade-systemd.sh \
136+
--after-install /hubble_build/conf/afterinstall.sh \
137+
--after-upgrade /hubble_build/conf/afterupgrade.sh \
138138
--before-remove /hubble_build/conf/beforeremove.sh \
139-
etc/hubble opt usr /var/log/hubble_osquery/backuplogs'
139+
etc/hubble /etc/init.d opt usr /var/log/hubble_osquery/backuplogs'
140140

141141
# edit to change iteration number, if necessary
142142
PKG_BASE_NAME=hubblestack-${HUBBLE_VERSION}-${HUBBLE_ITERATION}

‎pkg/centos7/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ RUN yum install -y ruby ruby-devel rpmbuild rpm-build rubygems gcc make \
139139
&& gem install --no-ri --no-rdoc fpm
140140

141141
# things we may need to build a python
142-
RUN yum install -y bzip2-devel
142+
RUN yum install -y bzip2-devel sqlite-devel
143143

144144
# use pyenv
145145
ARG PYENV_VERSION=3.6.10

‎pkg/centos8/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ RUN dnf install -y ruby ruby-devel rpm-build rubygems gcc make \
148148
&& gem install --no-ri --no-rdoc fpm
149149

150150
# things we may need to build a python
151-
RUN dnf install -y bzip2-devel
151+
RUN yum install -y bzip2-devel sqlite-devel
152152

153153
# use pyenv
154154
ARG PYENV_VERSION=3.6.10

‎pkg/coreos/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ RUN mkdir -p "$LIBGIT2TEMP" \
154154
&& make \
155155
&& make install
156156

157-
RUN apt-get install -y libbz2-dev
157+
RUN apt-get install -y libbz2-dev libsqlite3-dev
158158

159159
# use pyenv
160160
ARG PYENV_VERSION=3.6.10

‎pkg/debian10/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ RUN mkdir -p "$LIBGIT2TEMP" \
158158
RUN apt-get install -y ruby ruby-dev rubygems gcc make \
159159
&& gem install --no-ri --no-rdoc fpm
160160

161-
RUN apt-get install -y libbz2-dev
161+
RUN apt-get install -y libbz2-dev libsqlite3-dev
162162

163163
# use pyenv
164164
ARG PYENV_VERSION=3.6.10

‎pkg/debian10/entrypoint.sh

+6-6
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,11 @@ cp -va /entrypoint.sh /data/last-build.1
6565

6666
mkdir -p /var/log/hubble_osquery/backuplogs
6767

68-
mkdir -p /etc/init.d
68+
mkdir -p /usr/lib/systemd/system
6969
mkdir -p /etc/profile.d
7070
mkdir -p /etc/hubble
7171

72-
cp -v /hubble_build/pkg/hubble /etc/init.d
72+
cp -v /hubble_build/pkg/hubble.service /usr/lib/systemd/system/
7373
cp -v /hubble_build/conf/hubble-profile.sh /etc/profile.d/
7474

7575
if [ -f /data/hubble ]
@@ -102,7 +102,7 @@ tar -cSPvvzf /data/hubblestack-${HUBBLE_VERSION}.tar.gz \
102102
--exclude opt/hubble/pyenv \
103103
/etc/hubble /opt/hubble /opt/osquery \
104104
/etc/profile.d/hubble-profile.sh \
105-
/etc/init.d/hubble \
105+
/usr/lib/systemd/system/hubble.service \
106106
/var/log/hubble_osquery/backuplogs \
107107
2>&1 | tee /hubble_build/deb-pkg-start-tar.log
108108

@@ -132,10 +132,10 @@ fpm -s dir -t deb \
132132
--iteration ${HUBBLE_ITERATION} \
133133
--url ${HUBBLE_URL} \
134134
--deb-no-default-config-files \
135-
--after-install /hubble_build/conf/afterinstall.sh \
136-
--after-upgrade /hubble_build/conf/afterupgrade.sh \
135+
--after-install /hubble_build/conf/afterinstall-systemd.sh \
136+
--after-upgrade /hubble_build/conf/afterupgrade-systemd.sh \
137137
--before-remove /hubble_build/conf/beforeremove.sh \
138-
etc/hubble etc/init.d opt usr /var/log/hubble_osquery/backuplogs
138+
etc/hubble opt usr /var/log/hubble_osquery/backuplogs
139139

140140
# edit to change iteration number, if necessary
141141
PKG_BASE_NAME=hubblestack_${HUBBLE_VERSION}-${HUBBLE_ITERATION}

‎pkg/debian8/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ RUN mkdir -p "$LIBGIT2TEMP" \
160160
RUN apt-get install -y ruby ruby-dev rubygems gcc make \
161161
&& gem install --no-ri --no-rdoc fpm
162162

163-
RUN apt-get install -y libbz2-dev
163+
RUN apt-get install -y libbz2-dev libsqlite3-dev
164164

165165
# use pyenv
166166
ARG PYENV_VERSION=3.6.10

‎pkg/debian8/entrypoint.sh

+6-6
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,11 @@ cp -va /entrypoint.sh /data/last-build.1
6565

6666
mkdir -p /var/log/hubble_osquery/backuplogs
6767

68-
mkdir -p /etc/init.d
68+
mkdir -p /usr/lib/systemd/system
6969
mkdir -p /etc/profile.d
7070
mkdir -p /etc/hubble
7171

72-
cp -v /hubble_build/pkg/hubble /etc/init.d
72+
cp -v /hubble_build/pkg/hubble.service /usr/lib/systemd/system/
7373
cp -v /hubble_build/conf/hubble-profile.sh /etc/profile.d/
7474

7575
if [ -f /data/hubble ]
@@ -102,7 +102,7 @@ tar -cSPvvzf /data/hubblestack-${HUBBLE_VERSION}.tar.gz \
102102
--exclude opt/hubble/pyenv \
103103
/etc/hubble /opt/hubble /opt/osquery \
104104
/etc/profile.d/hubble-profile.sh \
105-
/etc/init.d/hubble \
105+
/usr/lib/systemd/system/hubble.service \
106106
/var/log/hubble_osquery/backuplogs \
107107
2>&1 | tee /hubble_build/deb-pkg-start-tar.log
108108

@@ -132,10 +132,10 @@ fpm -s dir -t deb \
132132
--iteration ${HUBBLE_ITERATION} \
133133
--url ${HUBBLE_URL} \
134134
--deb-no-default-config-files \
135-
--after-install /hubble_build/conf/afterinstall.sh \
136-
--after-upgrade /hubble_build/conf/afterupgrade.sh \
135+
--after-install /hubble_build/conf/afterinstall-systemd.sh \
136+
--after-upgrade /hubble_build/conf/afterupgrade-systemd.sh \
137137
--before-remove /hubble_build/conf/beforeremove.sh \
138-
etc/hubble etc/init.d opt usr /var/log/hubble_osquery/backuplogs
138+
etc/hubble opt usr /var/log/hubble_osquery/backuplogs
139139

140140
# edit to change iteration number, if necessary
141141
PKG_BASE_NAME=hubblestack_${HUBBLE_VERSION}-${HUBBLE_ITERATION}

‎pkg/debian9/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ RUN mkdir -p "$LIBGIT2TEMP" \
158158
RUN apt-get install -y ruby ruby-dev rubygems gcc make \
159159
&& gem install --no-ri --no-rdoc fpm
160160

161-
RUN apt-get install -y libbz2-dev
161+
RUN apt-get install -y libbz2-dev libsqlite3-dev
162162

163163
# use pyenv
164164
ARG PYENV_VERSION=3.6.10

‎pkg/debian9/entrypoint.sh

+6-6
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,11 @@ cp -va /entrypoint.sh /data/last-build.1
6565

6666
mkdir -p /var/log/hubble_osquery/backuplogs
6767

68-
mkdir -p /etc/init.d
68+
mkdir -p /usr/lib/systemd/system
6969
mkdir -p /etc/profile.d
7070
mkdir -p /etc/hubble
7171

72-
cp -v /hubble_build/pkg/hubble /etc/init.d
72+
cp -v /hubble_build/pkg/hubble.service /usr/lib/systemd/system/
7373
cp -v /hubble_build/conf/hubble-profile.sh /etc/profile.d/
7474

7575
if [ -f /data/hubble ]
@@ -102,7 +102,7 @@ tar -cSPvvzf /data/hubblestack-${HUBBLE_VERSION}.tar.gz \
102102
--exclude opt/hubble/pyenv \
103103
/etc/hubble /opt/hubble /opt/osquery \
104104
/etc/profile.d/hubble-profile.sh \
105-
/etc/init.d/hubble \
105+
/usr/lib/systemd/system/hubble.service \
106106
/var/log/hubble_osquery/backuplogs \
107107
2>&1 | tee /hubble_build/deb-pkg-start-tar.log
108108

@@ -132,10 +132,10 @@ fpm -s dir -t deb \
132132
--iteration ${HUBBLE_ITERATION} \
133133
--url ${HUBBLE_URL} \
134134
--deb-no-default-config-files \
135-
--after-install /hubble_build/conf/afterinstall.sh \
136-
--after-upgrade /hubble_build/conf/afterupgrade.sh \
135+
--after-install /hubble_build/conf/afterinstall-systemd.sh \
136+
--after-upgrade /hubble_build/conf/afterupgrade-systemd.sh \
137137
--before-remove /hubble_build/conf/beforeremove.sh \
138-
etc/hubble etc/init.d opt usr /var/log/hubble_osquery/backuplogs
138+
etc/hubble opt usr /var/log/hubble_osquery/backuplogs
139139

140140
# edit to change iteration number, if necessary
141141
PKG_BASE_NAME=hubblestack_${HUBBLE_VERSION}-${HUBBLE_ITERATION}

‎pkg/dev/centos6/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ RUN yum install -y rpmbuild rpm-build gcc make rh-ruby23 rh-ruby23-ruby-devel
140140
RUN scl enable rh-ruby23 "gem install --no-ri --no-rdoc fpm"
141141

142142
# things we may need to build a python
143-
RUN yum install -y bzip2-devel
143+
RUN yum install -y bzip2-devel sqlite-devel
144144

145145
# use pyenv
146146
ARG PYENV_VERSION=3.6.10

‎pkg/dev/centos6/entrypoint.sh

+6-6
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,11 @@ cp -va /entrypoint.sh /data/last-build.1
6565

6666
mkdir -p /var/log/hubble_osquery/backuplogs
6767

68-
mkdir -p /usr/lib/systemd/system
68+
mkdir -p /etc/init.d
6969
mkdir -p /etc/profile.d
7070
mkdir -p /etc/hubble
7171

72-
cp -v /hubble_build/pkg/hubble.service /usr/lib/systemd/system/
72+
cp -v /hubble_build/pkg/hubble /etc/init.d
7373
cp -v /hubble_build/conf/hubble-profile.sh /etc/profile.d/
7474

7575
if [ -f /data/hubble ]
@@ -102,7 +102,7 @@ tar -cSPvvzf /data/hubblestack-${HUBBLE_VERSION}.tar.gz \
102102
--exclude opt/hubble/pyenv \
103103
/etc/hubble /opt/hubble /opt/osquery \
104104
/etc/profile.d/hubble-profile.sh \
105-
/usr/lib/systemd/system/hubble.service \
105+
/etc/init.d/hubble \
106106
/var/log/hubble_osquery/backuplogs \
107107
2>&1 | tee /hubble_build/rpm-pkg-start-tar.log
108108

@@ -133,10 +133,10 @@ scl enable rh-ruby23 'fpm -s dir -t rpm \
133133
--url ${HUBBLE_URL} \
134134
--description "${HUBBLE_DESCRIPTION}" \
135135
--rpm-summary "${HUBBLE_SUMMARY}" \
136-
--after-install /hubble_build/conf/afterinstall-systemd.sh \
137-
--after-upgrade /hubble_build/conf/afterupgrade-systemd.sh \
136+
--after-install /hubble_build/conf/afterinstall.sh \
137+
--after-upgrade /hubble_build/conf/afterupgrade.sh \
138138
--before-remove /hubble_build/conf/beforeremove.sh \
139-
etc/hubble opt usr /var/log/hubble_osquery/backuplogs'
139+
etc/hubble /etc/init.d opt usr /var/log/hubble_osquery/backuplogs'
140140

141141
# edit to change iteration number, if necessary
142142
PKG_BASE_NAME=hubblestack-${HUBBLE_VERSION}-${HUBBLE_ITERATION}

‎pkg/dev/centos7/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ RUN yum install -y ruby ruby-devel rpmbuild rpm-build rubygems gcc make \
139139
&& gem install --no-ri --no-rdoc fpm
140140

141141
# things we may need to build a python
142-
RUN yum install -y bzip2-devel
142+
RUN yum install -y bzip2-devel sqlite-devel
143143

144144
# use pyenv
145145
ARG PYENV_VERSION=3.6.10

‎pkg/dev/centos8/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ RUN dnf install -y ruby ruby-devel rpm-build rubygems gcc make \
148148
&& gem install --no-ri --no-rdoc fpm
149149

150150
# things we may need to build a python
151-
RUN dnf install -y bzip2-devel
151+
RUN yum install -y bzip2-devel sqlite-devel
152152

153153
# use pyenv
154154
ARG PYENV_VERSION=3.6.10

‎pkg/dev/coreos/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ RUN mkdir -p "$LIBGIT2TEMP" \
154154
&& make \
155155
&& make install
156156

157-
RUN apt-get install -y libbz2-dev
157+
RUN apt-get install -y libbz2-dev libsqlite3-dev
158158

159159
# use pyenv
160160
ARG PYENV_VERSION=3.6.10

‎pkg/dev/debian10/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ RUN mkdir -p "$LIBGIT2TEMP" \
158158
RUN apt-get install -y ruby ruby-dev rubygems gcc make \
159159
&& gem install --no-ri --no-rdoc fpm
160160

161-
RUN apt-get install -y libbz2-dev
161+
RUN apt-get install -y libbz2-dev libsqlite3-dev
162162

163163
# use pyenv
164164
ARG PYENV_VERSION=3.6.10

‎pkg/dev/debian10/entrypoint.sh

+6-6
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,11 @@ cp -va /entrypoint.sh /data/last-build.1
6565

6666
mkdir -p /var/log/hubble_osquery/backuplogs
6767

68-
mkdir -p /etc/init.d
68+
mkdir -p /usr/lib/systemd/system
6969
mkdir -p /etc/profile.d
7070
mkdir -p /etc/hubble
7171

72-
cp -v /hubble_build/pkg/hubble /etc/init.d
72+
cp -v /hubble_build/pkg/hubble.service /usr/lib/systemd/system/
7373
cp -v /hubble_build/conf/hubble-profile.sh /etc/profile.d/
7474

7575
if [ -f /data/hubble ]
@@ -102,7 +102,7 @@ tar -cSPvvzf /data/hubblestack-${HUBBLE_VERSION}.tar.gz \
102102
--exclude opt/hubble/pyenv \
103103
/etc/hubble /opt/hubble /opt/osquery \
104104
/etc/profile.d/hubble-profile.sh \
105-
/etc/init.d/hubble \
105+
/usr/lib/systemd/system/hubble.service \
106106
/var/log/hubble_osquery/backuplogs \
107107
2>&1 | tee /hubble_build/deb-pkg-start-tar.log
108108

@@ -132,10 +132,10 @@ fpm -s dir -t deb \
132132
--iteration ${HUBBLE_ITERATION} \
133133
--url ${HUBBLE_URL} \
134134
--deb-no-default-config-files \
135-
--after-install /hubble_build/conf/afterinstall.sh \
136-
--after-upgrade /hubble_build/conf/afterupgrade.sh \
135+
--after-install /hubble_build/conf/afterinstall-systemd.sh \
136+
--after-upgrade /hubble_build/conf/afterupgrade-systemd.sh \
137137
--before-remove /hubble_build/conf/beforeremove.sh \
138-
etc/hubble etc/init.d opt usr /var/log/hubble_osquery/backuplogs
138+
etc/hubble opt usr /var/log/hubble_osquery/backuplogs
139139

140140
# edit to change iteration number, if necessary
141141
PKG_BASE_NAME=hubblestack_${HUBBLE_VERSION}-${HUBBLE_ITERATION}

‎pkg/dev/debian8/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ RUN mkdir -p "$LIBGIT2TEMP" \
160160
RUN apt-get install -y ruby ruby-dev rubygems gcc make \
161161
&& gem install --no-ri --no-rdoc fpm
162162

163-
RUN apt-get install -y libbz2-dev
163+
RUN apt-get install -y libbz2-dev libsqlite3-dev
164164

165165
# use pyenv
166166
ARG PYENV_VERSION=3.6.10

‎pkg/dev/debian8/entrypoint.sh

+6-6
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,11 @@ cp -va /entrypoint.sh /data/last-build.1
6565

6666
mkdir -p /var/log/hubble_osquery/backuplogs
6767

68-
mkdir -p /etc/init.d
68+
mkdir -p /usr/lib/systemd/system
6969
mkdir -p /etc/profile.d
7070
mkdir -p /etc/hubble
7171

72-
cp -v /hubble_build/pkg/hubble /etc/init.d
72+
cp -v /hubble_build/pkg/hubble.service /usr/lib/systemd/system/
7373
cp -v /hubble_build/conf/hubble-profile.sh /etc/profile.d/
7474

7575
if [ -f /data/hubble ]
@@ -102,7 +102,7 @@ tar -cSPvvzf /data/hubblestack-${HUBBLE_VERSION}.tar.gz \
102102
--exclude opt/hubble/pyenv \
103103
/etc/hubble /opt/hubble /opt/osquery \
104104
/etc/profile.d/hubble-profile.sh \
105-
/etc/init.d/hubble \
105+
/usr/lib/systemd/system/hubble.service \
106106
/var/log/hubble_osquery/backuplogs \
107107
2>&1 | tee /hubble_build/deb-pkg-start-tar.log
108108

@@ -132,10 +132,10 @@ fpm -s dir -t deb \
132132
--iteration ${HUBBLE_ITERATION} \
133133
--url ${HUBBLE_URL} \
134134
--deb-no-default-config-files \
135-
--after-install /hubble_build/conf/afterinstall.sh \
136-
--after-upgrade /hubble_build/conf/afterupgrade.sh \
135+
--after-install /hubble_build/conf/afterinstall-systemd.sh \
136+
--after-upgrade /hubble_build/conf/afterupgrade-systemd.sh \
137137
--before-remove /hubble_build/conf/beforeremove.sh \
138-
etc/hubble etc/init.d opt usr /var/log/hubble_osquery/backuplogs
138+
etc/hubble opt usr /var/log/hubble_osquery/backuplogs
139139

140140
# edit to change iteration number, if necessary
141141
PKG_BASE_NAME=hubblestack_${HUBBLE_VERSION}-${HUBBLE_ITERATION}

‎pkg/dev/debian9/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ RUN mkdir -p "$LIBGIT2TEMP" \
158158
RUN apt-get install -y ruby ruby-dev rubygems gcc make \
159159
&& gem install --no-ri --no-rdoc fpm
160160

161-
RUN apt-get install -y libbz2-dev
161+
RUN apt-get install -y libbz2-dev libsqlite3-dev
162162

163163
# use pyenv
164164
ARG PYENV_VERSION=3.6.10

0 commit comments

Comments
 (0)