Skip to content

Commit 6599645

Browse files
ihaardikar2rsawseen
authored andcommitted
Upgrade base image to support node v20
(cherry picked from commit 245578e)
1 parent 4f6156d commit 6599645

File tree

3 files changed

+9
-11
lines changed

3 files changed

+9
-11
lines changed

Dockerfile-api

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:hydrogen-bullseye-slim
1+
FROM node:iron-bookworm-slim
22

33
ARG COUNTLY_PLUGINS=mobile,web,desktop,plugins,density,locale,browser,sources,views,logger,systemlogs,populator,reports,crashes,push,star-rating,slipping-away-users,compare,server-stats,dbviewer,times-of-day,compliance-hub,alerts,onboarding,consolidate,remote-config,hooks,dashboards,sdk,data-manager,guides
44
# Countly Enterprise:
@@ -25,15 +25,14 @@ COPY . .
2525

2626
# install required dependencies which slim image doesn't have
2727
RUN apt-get update && \
28-
apt-get install -y iputils-ping procps net-tools telnet apt-transport-https curl wget git python2 make gcc g++ unzip && \
29-
ln -s /usr/bin/python2.7 /usr/bin/python
28+
apt-get install -y iputils-ping procps net-tools telnet apt-transport-https curl wget git make gcc g++ unzip xz-utils
3029

3130
RUN apt-get update && \
3231
apt-get upgrade -y && \
3332
cd /usr/src && \
3433
wget https://www.python.org/ftp/python/3.8.12/Python-3.8.12.tar.xz && \
3534
tar -xf Python-3.8.12.tar.xz && \
36-
apt-get install -y build-essential sudo zlib1g-dev libssl1.1 libncurses5-dev libgdbm-dev libnss3-dev libssl-dev libsqlite3-dev libreadline-dev libffi-dev curl libbz2-dev && \
35+
apt-get install -y build-essential sudo zlib1g-dev libssl3 libncurses5-dev libgdbm-dev libnss3-dev libssl-dev libsqlite3-dev libreadline-dev libffi-dev curl libbz2-dev && \
3736
cd Python-3.8.12 && \
3837
./configure --enable-optimizations --enable-shared && \
3938
make && \

Dockerfile-frontend

+2-3
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,14 @@ WORKDIR /opt/countly
2121
COPY . .
2222
# install required dependencies which slim image doesn't have
2323
RUN apt-get update && \
24-
apt-get install -y iputils-ping net-tools telnet apt-transport-https procps curl wget git python2 make gcc g++ unzip && \
25-
ln -s /usr/bin/python2.7 /usr/bin/python
24+
apt-get install -y iputils-ping net-tools telnet apt-transport-https procps curl wget git make gcc g++ unzip xz-utils
2625

2726
RUN apt-get update && \
2827
apt-get upgrade -y && \
2928
cd /usr/src && \
3029
wget https://www.python.org/ftp/python/3.8.12/Python-3.8.12.tar.xz && \
3130
tar -xf Python-3.8.12.tar.xz && \
32-
apt-get install -y build-essential sudo zlib1g-dev libssl1.1 libncurses5-dev libgdbm-dev libnss3-dev libssl-dev libsqlite3-dev libreadline-dev libffi-dev curl libbz2-dev && \
31+
apt-get install -y build-essential sudo zlib1g-dev libssl3 libncurses5-dev libgdbm-dev libnss3-dev libssl-dev libsqlite3-dev libreadline-dev libffi-dev curl libbz2-dev && \
3332
cd Python-3.8.12 && \
3433
./configure --enable-optimizations --enable-shared && \
3534
make && \

docker-compose.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ services:
1616

1717
countly-api:
1818
image: 'countly/api:latest'
19-
# Countly Enterprise: image: 'gcr.io/countly-01/api:20.11.2'
19+
# Countly Enterprise: image: 'gcr.io/countly-01/api:24.12'
2020
environment:
2121
- COUNTLY_PLUGINS=mobile,web,desktop,plugins,density,locale,browser,sources,views,logger,systemlogs,populator,reports,crashes,push,star-rating,slipping-away-users,compare,server-stats,dbviewer,times-of-day,compliance-hub,alerts,onboarding,consolidate,remote-config,hooks,dashboards,sdk,data-manager
22-
# Countly Enterprise: - COUNTLY_PLUGINS=mobile,web,desktop,plugins,density,locale,browser,sources,views,license,drill,funnels,retention_segments,flows,cohorts,surveys,remote-config,ab-testing,formulas,activity-map,concurrent_users,revenue,logger,systemlogs,populator,reports,crashes,push,geo,block,restrict,users,star-rating,slipping-away-users,compare,server-stats,assistant,dbviewer,crash_symbolication,crashes-jira,groups,white-labeling,alerts,times-of-day,compliance-hub,onboarding,active_users,performance-monitoring,config-transfer,consolidate,data-manager,hooks,dashboards,sdk
22+
# Countly Enterprise: - COUNTLY_PLUGINS=mobile,web,desktop,plugins,density,locale,browser,sources,views,license,drill,funnels,retention_segments,flows,cohorts,surveys,remote-config,ab-testing,formulas,activity-map,concurrent_users,revenue,logger,systemlogs,populator,reports,crashes,push,geo,block,users,star-rating,slipping-away-users,compare,server-stats,dbviewer,crash_symbolication,crashes-jira,groups,white-labeling,alerts,times-of-day,compliance-hub,onboarding,active_users,performance-monitoring,config-transfer,consolidate,data-manager,hooks,dashboards,sdk
2323
- COUNTLY_CONFIG__MONGODB_HOST=mongodb
2424
- COUNTLY_CONFIG_API_API_WORKERS=4 # CPU core count
2525
- COUNTLY_CONFIG__FILESTORAGE="gridfs"
@@ -37,10 +37,10 @@ services:
3737

3838
countly-frontend:
3939
image: 'countly/frontend:latest'
40-
# Countly Enterprise: image: 'gcr.io/countly-01/frontend:20.11.2'
40+
# Countly Enterprise: image: 'gcr.io/countly-01/frontend:24.12'
4141
environment:
4242
- COUNTLY_PLUGINS=mobile,web,desktop,plugins,density,locale,browser,sources,views,logger,systemlogs,populator,reports,crashes,push,star-rating,slipping-away-users,compare,server-stats,dbviewer,times-of-day,compliance-hub,alerts,onboarding,consolidate,remote-config,hooks,dashboards,sdk,data-manager
43-
# Countly Enterprise: - COUNTLY_PLUGINS=mobile,web,desktop,plugins,density,locale,browser,sources,views,license,drill,funnels,retention_segments,flows,cohorts,surveys,remote-config,ab-testing,formulas,activity-map,concurrent_users,revenue,logger,systemlogs,populator,reports,crashes,push,geo,block,restrict,users,star-rating,slipping-away-users,compare,server-stats,assistant,dbviewer,crash_symbolication,crashes-jira,groups,white-labeling,alerts,times-of-day,compliance-hub,onboarding,active_users,performance-monitoring,config-transfer,consolidate,data-manager,hooks,dashboards,sdk
43+
# Countly Enterprise: - COUNTLY_PLUGINS=mobile,web,desktop,plugins,density,locale,browser,sources,views,license,drill,funnels,retention_segments,flows,cohorts,surveys,remote-config,ab-testing,formulas,activity-map,concurrent_users,revenue,logger,systemlogs,populator,reports,crashes,push,geo,block,users,star-rating,slipping-away-users,compare,server-stats,dbviewer,crash_symbolication,crashes-jira,groups,white-labeling,alerts,times-of-day,compliance-hub,onboarding,active_users,performance-monitoring,config-transfer,consolidate,data-manager,hooks,dashboards,sdk
4444
- COUNTLY_CONFIG__MONGODB_HOST=mongodb
4545
- NODE_OPTIONS="--max-old-space-size=2048"
4646
networks:

0 commit comments

Comments
 (0)