File tree 4 files changed +8
-4
lines changed
4 files changed +8
-4
lines changed Original file line number Diff line number Diff line change @@ -50,14 +50,15 @@ RUN curl -s -L -o /tmp/tini.deb "https://github.com/krallin/tini/releases/downlo
50
50
# preinstall
51
51
cp -n ./api/config.sample.js ./api/config.js && \
52
52
cp -n ./frontend/express/config.sample.js ./frontend/express/config.js && \
53
+ HOME=/tmp npm install -g npm@latest && \
53
54
HOME=/tmp npm install --unsafe-perm=true --allow-root && \
54
55
HOME=/tmp npm install argon2 --build-from-source --unsafe-perm=true --allow-root && \
55
56
./bin/docker/preinstall.sh && \
56
57
bash /opt/countly/bin/scripts/detect.init.sh && \
57
58
\
58
59
# cleanup & chown
59
60
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 && \
61
62
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 && \
62
63
apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
63
64
rm -rf test /tmp/* /tmp/.??* /var/tmp/* /var/tmp/.??* /var/log/* /root/.npm && \
Original file line number Diff line number Diff line change @@ -34,7 +34,7 @@ RUN yum update -y
34
34
RUN curl -s -L -o /tmp/tini.rpm "https://github.com/krallin/tini/releases/download/v${TINI_VERSION}/tini_${TINI_VERSION}.rpm" && \
35
35
rpm -i /tmp/tini.rpm && \
36
36
\
37
- curl -sL https://rpm.nodesource.com/setup_18 .x | bash - && \
37
+ curl -sL https://rpm.nodesource.com/setup_20 .x | bash - && \
38
38
yum install -y nodejs python3.8 python2 python38-libs python38-devel python38-pip nss libdrm libgbm cyrus-sasl* && \
39
39
ln -s /usr/bin/node /usr/bin/nodejs && \
40
40
unlink /usr/bin/python3 && \
@@ -53,6 +53,7 @@ RUN curl -s -L -o /tmp/tini.rpm "https://github.com/krallin/tini/releases/downlo
53
53
# preinstall
54
54
cp -n ./api/config.sample.js ./api/config.js && \
55
55
cp -n ./frontend/express/config.sample.js ./frontend/express/config.js && \
56
+ HOME=/tmp npm install -g npm@latest && \
56
57
HOME=/tmp npm install --unsafe-perm=true --allow-root && \
57
58
HOME=/tmp npm install argon2 --build-from-source --unsafe-perm=true --allow-root && \
58
59
./bin/docker/preinstall.sh && \
Original file line number Diff line number Diff line change @@ -32,7 +32,7 @@ RUN yum update -y
32
32
RUN curl -s -L -o /tmp/tini.rpm "https://github.com/krallin/tini/releases/download/v${TINI_VERSION}/tini_${TINI_VERSION}.rpm" && \
33
33
rpm -i /tmp/tini.rpm && \
34
34
\
35
- curl -sL https://rpm.nodesource.com/setup_18 .x | bash - && \
35
+ curl -sL https://rpm.nodesource.com/setup_20 .x | bash - && \
36
36
yum install -y nodejs python3.8 python2 python38-libs python38-devel python38-pip nss libdrm libgbm cyrus-sasl* && \
37
37
ln -s /usr/bin/node /usr/bin/nodejs && \
38
38
unlink /usr/bin/python3 && \
@@ -52,6 +52,7 @@ RUN curl -s -L -o /tmp/tini.rpm "https://github.com/krallin/tini/releases/downlo
52
52
cp -n ./frontend/express/public/javascripts/countly/countly.config.sample.js ./frontend/express/public/javascripts/countly/countly.config.js && \
53
53
cp -n ./frontend/express/config.sample.js ./frontend/express/config.js && \
54
54
cp -n ./api/config.sample.js ./api/config.js && \
55
+ HOME=/tmp npm install -g npm@latest && \
55
56
HOME=/tmp npm install --unsafe-perm=true --allow-root && \
56
57
HOME=/tmp npm install argon2 --build-from-source --unsafe-perm=true --allow-root && \
57
58
./bin/docker/preinstall.sh && \
Original file line number Diff line number Diff line change @@ -47,6 +47,7 @@ RUN curl -s -L -o /tmp/tini.deb "https://github.com/krallin/tini/releases/downlo
47
47
cp -n ./api/config.sample.js ./api/config.js && \
48
48
cp -n ./frontend/express/config.sample.js ./frontend/express/config.js && \
49
49
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 && \
50
51
HOME=/tmp npm install --unsafe-perm=true --allow-root && \
51
52
HOME=/tmp npm install argon2 --build-from-source --unsafe-perm=true --allow-root && \
52
53
./bin/docker/preinstall.sh && \
@@ -55,7 +56,7 @@ RUN curl -s -L -o /tmp/tini.deb "https://github.com/krallin/tini/releases/downlo
55
56
\
56
57
# cleanup & chown
57
58
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 && \
59
60
apt-get autoremove -y && \
60
61
apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
61
62
rm -rf test /tmp/* /tmp/.??* /var/tmp/* /var/tmp/.??* /var/log/* /root/.npm && \
You can’t perform that action at this time.
0 commit comments