Skip to content

Commit 3b0b3ef

Browse files
committed
[push] Removing nghttp2 from install scripts
1 parent 8f558b2 commit 3b0b3ef

7 files changed

+0
-58
lines changed

Dockerfile-api

-3
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@ COPY . .
2121

2222
RUN curl -s -L -o /tmp/tini.deb "https://github.com/krallin/tini/releases/download/v${TINI_VERSION}/tini_${TINI_VERSION}.deb" && \
2323
dpkg -i /tmp/tini.deb && \
24-
git clone https://github.com/nghttp2/nghttp2.git /tmp/nghttp2 --single-branch --branch=v1.30.0 --depth=1 && \
25-
(cd /tmp/nghttp2; \
26-
export CFLAGS="-g -O2 -fPIC" && export CPPFLAGS="-fPIC" && autoreconf -i && automake && autoconf && ./configure --disable-examples --disable-app && make && make install) && \
2724
\
2825
# modify standard distribution
2926
apt-get update && apt-get install -y sqlite3 && \

Dockerfile-centos-api

-4
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,6 @@ RUN curl -s -L -o /tmp/tini.rpm "https://github.com/krallin/tini/releases/downlo
3232
yum -y install openssl-devel devtoolset-7-gcc-c++ make git wget unzip make binutils autoconf automake makedepend libtool pkgconfig zlib-devel libxml2-devel python-setuptools which && \
3333
source /opt/rh/devtoolset-7/enable && \
3434
\
35-
git clone https://github.com/nghttp2/nghttp2.git /tmp/nghttp2 --single-branch --branch=v1.41.0 --depth=1 && \
36-
(cd /tmp/nghttp2; \
37-
export CFLAGS="-g -O2 -fPIC" && export CPPFLAGS="-fPIC" && autoreconf -i && automake && autoconf && ./configure --disable-examples --disable-app && make && make install) && \
38-
\
3935
# modify standard distribution
4036
./bin/docker/modify.sh && \
4137
\

Dockerfile-core

-6
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,6 @@ RUN useradd -r -M -U -d /opt/countly -s /bin/false countly && \
4343
apt-get update && \
4444
apt-get -y install nodejs mongodb-org-shell mongodb-org-tools && \
4545
\
46-
# nghttp2
47-
(git clone https://github.com/nghttp2/nghttp2.git /tmp/nghttp2 --single-branch --branch=v1.30.0 --depth=1 && \
48-
cd /tmp/nghttp2 && \
49-
export CFLAGS="-g -O2 -fPIC" && export CPPFLAGS="-fPIC" && autoreconf -i && automake && autoconf && \
50-
./configure --disable-examples --disable-app && make && make install && export CC="" && export CXX="") && \
51-
\
5246
# configs
5347
cp ./bin/config/nginx.server.conf /etc/nginx/sites-enabled/default && \
5448
cp ./bin/config/nginx.conf /etc/nginx/nginx.conf && \

bin/countly.install_rhel.sh

-3
Original file line numberDiff line numberDiff line change
@@ -145,9 +145,6 @@ if [ ! -f "/etc/timezone" ]; then
145145
echo "Etc/UTC" > /etc/timezone
146146
fi
147147

148-
#install nghttp2
149-
bash "$DIR/scripts/install.nghttp2.sh"
150-
151148
#install plugins
152149
node "$DIR/scripts/install_plugins"
153150

bin/countly.install_travis.sh

-3
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,6 @@ echo "$plugins" > plugins.json
111111

112112
)
113113

114-
#install nghttp2
115-
bash "$DIR/scripts/install.nghttp2.sh"
116-
117114
#install plugins
118115
bash "$DIR/scripts/countly.install.plugins.sh"
119116

bin/countly.install_ubuntu.sh

-3
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,6 @@ if [ ! -f "/etc/timezone" ]; then
125125
echo "Etc/UTC" > /etc/timezone
126126
fi
127127

128-
#install nghttp2
129-
bash "$DIR/scripts/install.nghttp2.sh"
130-
131128
#install plugins
132129
bash "$DIR/scripts/countly.install.plugins.sh"
133130

bin/scripts/install.nghttp2.sh

-36
This file was deleted.

0 commit comments

Comments
 (0)