Skip to content

Commit b94377f

Browse files
committed
[docker] Bumping base images
1 parent ae3ae90 commit b94377f

5 files changed

+13
-19
lines changed

Dockerfile-api

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:10.19-jessie
1+
FROM node:14-bionic
22

33
ARG COUNTLY_PLUGINS=mobile,web,desktop,plugins,density,locale,browser,sources,views,enterpriseinfo,logger,systemlogs,populator,reports,crashes,push,star-rating,slipping-away-users,compare,server-stats,dbviewer,assistant,times-of-day,compliance-hub,video-intelligence-monetization,alerts,onboarding
44
# Enterprise Edition:

Dockerfile-centos-api

+3-8
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM centos/nodejs-10-centos7
1+
FROM centos/nodejs-14-centos7
22

33
ARG COUNTLY_PLUGINS=mobile,web,desktop,plugins,density,locale,browser,sources,views,enterpriseinfo,logger,systemlogs,populator,reports,crashes,push,star-rating,slipping-away-users,compare,server-stats,dbviewer,assistant,times-of-day,compliance-hub,video-intelligence-monetization,alerts,onboarding
44
# Enterprise Edition:
@@ -24,12 +24,7 @@ COPY . .
2424
RUN curl -s -L -o /tmp/tini.rpm "https://github.com/krallin/tini/releases/download/v${TINI_VERSION}/tini_${TINI_VERSION}.rpm" && \
2525
rpm -i /tmp/tini.rpm && \
2626
\
27-
yum -y install openssl-devel gcc-c++-4.8.5 make git make binutils autoconf automake makedepend libtool pkgconfig zlib-devel libxml2-devel python-setuptools && \
28-
wget https://www.openssl.org/source/openssl-1.1.1f.tar.gz && \
29-
tar -zxvf openssl-1.1.1f.tar.gz -C /tmp && \
30-
rm openssl-1.1.1f.tar.gz && \
31-
( cd /tmp/openssl-1.1.1f; \
32-
./config --prefix=/usr && make depend && make && make install_sw ) && \
27+
yum -y install openssl-devel gcc-c++ make git make binutils autoconf automake makedepend libtool pkgconfig zlib-devel libxml2-devel python-setuptools && \
3328
\
3429
git clone https://github.com/nghttp2/nghttp2.git /tmp/nghttp2 --single-branch --branch=v1.41.0 --depth=1 && \
3530
(cd /tmp/nghttp2; \
@@ -49,7 +44,7 @@ RUN curl -s -L -o /tmp/tini.rpm "https://github.com/krallin/tini/releases/downlo
4944
# cleanup & chown
5045
npm remove -y mocha nyc should supertest && \
5146
rm -rf /opt/app-root/src/.npm && \
52-
yum remove -y git gcc make automake autoconf makedepend zlib-devel libxml2-devel python-setuptools openssl-devel devtoolset-7-gcc devtoolset-7-libstdc++-devel python36-devel centos-release-scl devtoolset-7-gcc-c++ && \
47+
yum remove -y git gcc-c++ gcc make automake autoconf makedepend zlib-devel libxml2-devel python-setuptools openssl-devel devtoolset-7-gcc devtoolset-7-libstdc++-devel python36-devel centos-release-scl devtoolset-7-gcc-c++ && \
5348
yum -y install pango.x86_64 libXcomposite.x86_64 libXcursor.x86_64 libXdamage.x86_64 libXext.x86_64 libXi.x86_64 libXtst.x86_64 cups-libs.x86_64 libXScrnSaver.x86_64 libXrandr.x86_64 GConf2.x86_64 alsa-lib.x86_64 atk.x86_64 gtk3.x86_64 ipa-gothic-fonts xorg-x11-fonts-100dpi xorg-x11-fonts-75dpi xorg-x11-utils xorg-x11-fonts-cyrillic xorg-x11-fonts-Type1 xorg-x11-fonts-misc && \
5449
yum clean all && \
5550
rm -rf test /tmp/* /tmp/.??* /var/tmp/* /var/tmp/.??* /var/log/* && \

Dockerfile-centos-frontend

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM centos/nodejs-10-centos7
1+
FROM centos/nodejs-14-centos7
22

33
ARG COUNTLY_PLUGINS=mobile,web,desktop,plugins,density,locale,browser,sources,views,enterpriseinfo,logger,systemlogs,populator,reports,crashes,push,star-rating,slipping-away-users,compare,server-stats,dbviewer,assistant,times-of-day,compliance-hub,video-intelligence-monetization,alerts,onboarding
44
# Enterprise Edition:

Dockerfile-core

+7-8
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM phusion/baseimage:0.11
1+
FROM phusion/baseimage:bionic-1.0.0
22

33
ARG COUNTLY_PLUGINS=mobile,web,desktop,plugins,density,locale,browser,sources,views,enterpriseinfo,logger,systemlogs,populator,reports,crashes,push,star-rating,slipping-away-users,compare,server-stats,dbviewer,assistant,times-of-day,compliance-hub,video-intelligence-monetization,alerts,onboarding
44
# Enterprise Edition:
@@ -33,19 +33,18 @@ RUN useradd -r -M -U -d /opt/countly -s /bin/false countly && \
3333
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 \
3434
libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 ca-certificates fonts-liberation libappindicator1 libnss3 lsb-release xdg-utils \
3535
# push / nghttp2
36-
gcc-4.8 g++-4.8 make binutils autoconf automake autotools-dev libtool pkg-config zlib1g-dev libcunit1-dev libssl-dev libxml2-dev libev-dev \
36+
gcc g++ make binutils autoconf automake autotools-dev libtool pkg-config zlib1g-dev libcunit1-dev libssl-dev libxml2-dev libev-dev \
3737
libevent-dev libjansson-dev libjemalloc-dev cython python3-dev python-setuptools && \
3838
# node
39-
wget -qO- https://deb.nodesource.com/setup_10.x | bash - && \
39+
wget -qO- https://deb.nodesource.com/setup_14.x | bash - && \
4040
# data_migration (mongo clients)
41-
wget -qO - https://www.mongodb.org/static/pgp/server-3.6.asc | apt-key add - && \
42-
echo "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu xenial/mongodb-org/3.6 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-3.6.list && \
41+
wget -qO - https://www.mongodb.org/static/pgp/server-4.4.asc | apt-key add - && \
42+
echo "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.4 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-4.4.list && \
4343
apt-get update && \
4444
apt-get -y install nodejs mongodb-org-shell mongodb-org-tools && \
4545
\
4646
# nghttp2
47-
(export CXX="g++-4.8" && export CC="gcc-4.8" && update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 90 && \
48-
git clone https://github.com/nghttp2/nghttp2.git /tmp/nghttp2 --single-branch --branch=v1.30.0 --depth=1 && \
47+
(git clone https://github.com/nghttp2/nghttp2.git /tmp/nghttp2 --single-branch --branch=v1.30.0 --depth=1 && \
4948
cd /tmp/nghttp2 && \
5049
export CFLAGS="-g -O2 -fPIC" && export CPPFLAGS="-fPIC" && autoreconf -i && automake && autoconf && \
5150
./configure --disable-examples --disable-app && make && make install && export CC="" && export CXX="") && \
@@ -80,7 +79,7 @@ RUN useradd -r -M -U -d /opt/countly -s /bin/false countly && \
8079
# cleanup
8180
npm remove -y mocha nyc should supertest && \
8281
apt-get -y remove build-essential libkrb5-dev git sqlite3 wget \
83-
gcc-4.8 g++-4.8 gcc g++ make binutils autoconf automake autotools-dev libtool pkg-config zlib1g-dev libcunit1-dev libssl-dev libxml2-dev libev-dev libevent-dev libjansson-dev libjemalloc-dev cython python3-dev python-setuptools && \
82+
gcc g++ make binutils autoconf automake autotools-dev libtool pkg-config zlib1g-dev libcunit1-dev libssl-dev libxml2-dev libev-dev libevent-dev libjansson-dev libjemalloc-dev cython python3-dev python-setuptools && \
8483
apt-get -y install gconf-service libasound2 libatk1.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 && \
8584
apt-get clean && \
8685
rm -rf /var/lib/apt/lists/* /tmp/* /tmp/.??* /var/tmp/* /var/log/* /var/tmp/.??* ~/.npm ~/.cache && \

Dockerfile-frontend

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:10.19-jessie
1+
FROM node:14-bionic
22

33
ARG COUNTLY_PLUGINS=mobile,web,desktop,plugins,density,locale,browser,sources,views,enterpriseinfo,logger,systemlogs,populator,reports,crashes,push,star-rating,slipping-away-users,compare,server-stats,dbviewer,assistant,times-of-day,compliance-hub,video-intelligence-monetization,alerts,onboarding
44
# Enterprise Edition:

0 commit comments

Comments
 (0)