Skip to content

Commit 47a7089

Browse files
ihaardikar2rsawseen
authored andcommitted
upgraded node version in centos images
(cherry picked from commit ac7e850)
1 parent b914bbc commit 47a7089

4 files changed

+8
-4
lines changed

Dockerfile-api

+2-1
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,15 @@ RUN curl -s -L -o /tmp/tini.deb "https://github.com/krallin/tini/releases/downlo
5050
# preinstall
5151
cp -n ./api/config.sample.js ./api/config.js && \
5252
cp -n ./frontend/express/config.sample.js ./frontend/express/config.js && \
53+
HOME=/tmp npm install -g npm@latest && \
5354
HOME=/tmp npm install --unsafe-perm=true --allow-root && \
5455
HOME=/tmp npm install argon2 --build-from-source --unsafe-perm=true --allow-root && \
5556
./bin/docker/preinstall.sh && \
5657
bash /opt/countly/bin/scripts/detect.init.sh && \
5758
\
5859
# cleanup & chown
5960
npm remove -y --no-save mocha nyc should supertest && \
60-
apt-get remove -y git gcc g++ make automake autoconf libtool pkg-config unzip sqlite3 && \
61+
apt-get remove -y git gcc g++ make automake autoconf libtool pkg-config unzip sqlite3 wget && \
6162
apt-get install -y libgbm-dev libgbm1 gconf-service libasound2 libatk1.0-0 libatk-bridge2.0-0 libc6 libcairo2 libcups2 libdbus-1-3 libexpat1 libfontconfig1 libgcc1 libgconf-2-4 libgdk-pixbuf2.0-0 libglib2.0-0 libgtk-3-0 libnspr4 libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 ca-certificates fonts-liberation libappindicator1 libnss3 lsb-release xdg-utils && \
6263
apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
6364
rm -rf test /tmp/* /tmp/.??* /var/tmp/* /var/tmp/.??* /var/log/* /root/.npm && \

Dockerfile-centos-api

+2-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ RUN yum update -y
3434
RUN curl -s -L -o /tmp/tini.rpm "https://github.com/krallin/tini/releases/download/v${TINI_VERSION}/tini_${TINI_VERSION}.rpm" && \
3535
rpm -i /tmp/tini.rpm && \
3636
\
37-
curl -sL https://rpm.nodesource.com/setup_18.x | bash - && \
37+
curl -sL https://rpm.nodesource.com/setup_20.x | bash - && \
3838
yum install -y nodejs python3.8 python2 python38-libs python38-devel python38-pip nss libdrm libgbm cyrus-sasl* && \
3939
ln -s /usr/bin/node /usr/bin/nodejs && \
4040
unlink /usr/bin/python3 && \
@@ -53,6 +53,7 @@ RUN curl -s -L -o /tmp/tini.rpm "https://github.com/krallin/tini/releases/downlo
5353
# preinstall
5454
cp -n ./api/config.sample.js ./api/config.js && \
5555
cp -n ./frontend/express/config.sample.js ./frontend/express/config.js && \
56+
HOME=/tmp npm install -g npm@latest && \
5657
HOME=/tmp npm install --unsafe-perm=true --allow-root && \
5758
HOME=/tmp npm install argon2 --build-from-source --unsafe-perm=true --allow-root && \
5859
./bin/docker/preinstall.sh && \

Dockerfile-centos-frontend

+2-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ RUN yum update -y
3232
RUN curl -s -L -o /tmp/tini.rpm "https://github.com/krallin/tini/releases/download/v${TINI_VERSION}/tini_${TINI_VERSION}.rpm" && \
3333
rpm -i /tmp/tini.rpm && \
3434
\
35-
curl -sL https://rpm.nodesource.com/setup_18.x | bash - && \
35+
curl -sL https://rpm.nodesource.com/setup_20.x | bash - && \
3636
yum install -y nodejs python3.8 python2 python38-libs python38-devel python38-pip nss libdrm libgbm cyrus-sasl* && \
3737
ln -s /usr/bin/node /usr/bin/nodejs && \
3838
unlink /usr/bin/python3 && \
@@ -52,6 +52,7 @@ RUN curl -s -L -o /tmp/tini.rpm "https://github.com/krallin/tini/releases/downlo
5252
cp -n ./frontend/express/public/javascripts/countly/countly.config.sample.js ./frontend/express/public/javascripts/countly/countly.config.js && \
5353
cp -n ./frontend/express/config.sample.js ./frontend/express/config.js && \
5454
cp -n ./api/config.sample.js ./api/config.js && \
55+
HOME=/tmp npm install -g npm@latest && \
5556
HOME=/tmp npm install --unsafe-perm=true --allow-root && \
5657
HOME=/tmp npm install argon2 --build-from-source --unsafe-perm=true --allow-root && \
5758
./bin/docker/preinstall.sh && \

Dockerfile-frontend

+2-1
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ RUN curl -s -L -o /tmp/tini.deb "https://github.com/krallin/tini/releases/downlo
4747
cp -n ./api/config.sample.js ./api/config.js && \
4848
cp -n ./frontend/express/config.sample.js ./frontend/express/config.js && \
4949
cp -n ./frontend/express/public/javascripts/countly/countly.config.sample.js ./frontend/express/public/javascripts/countly/countly.config.js && \
50+
HOME=/tmp npm install -g npm@latest && \
5051
HOME=/tmp npm install --unsafe-perm=true --allow-root && \
5152
HOME=/tmp npm install argon2 --build-from-source --unsafe-perm=true --allow-root && \
5253
./bin/docker/preinstall.sh && \
@@ -55,7 +56,7 @@ RUN curl -s -L -o /tmp/tini.deb "https://github.com/krallin/tini/releases/downlo
5556
\
5657
# cleanup & chown
5758
npm remove -y --no-save mocha nyc should supertest puppeteer && \
58-
apt-get remove -y git gcc g++ make automake autoconf libtool pkg-config unzip sqlite3 && \
59+
apt-get remove -y git gcc g++ make automake autoconf libtool pkg-config unzip sqlite3 wget && \
5960
apt-get autoremove -y && \
6061
apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
6162
rm -rf test /tmp/* /tmp/.??* /var/tmp/* /var/tmp/.??* /var/log/* /root/.npm && \

0 commit comments

Comments
 (0)