Skip to content

Commit cf0725a

Browse files
authored
Merge pull request #6875 from Countly/dockerfile-core-jammy
Dockerfile core jammy
2 parents 7f7e594 + b93c9c2 commit cf0725a

File tree

2 files changed

+20
-6
lines changed

2 files changed

+20
-6
lines changed

Dockerfile-core

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM phusion/baseimage:focal-1.2.0
1+
FROM phusion/baseimage:jammy-1.0.4
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:
@@ -38,7 +38,7 @@ RUN useradd -r -M -U -d /opt/countly -s /bin/false countly && \
3838
libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 ca-certificates fonts-liberation libappindicator1 libnss3 lsb-release xdg-utils \
3939
# push / nghttp2
4040
gcc g++ make binutils autoconf automake autotools-dev libtool pkg-config zlib1g-dev libcunit1-dev libssl-dev libxml2-dev libev-dev \
41-
libevent-dev libjansson-dev libjemalloc-dev cython python3-dev python-setuptools && \
41+
libevent-dev libjansson-dev libjemalloc-dev python3-dev python-setuptools && \
4242
# node
4343
wget -qO- https://deb.nodesource.com/setup_20.x | bash - && \
4444
# data_migration (mongo clients)
@@ -77,7 +77,7 @@ RUN useradd -r -M -U -d /opt/countly -s /bin/false countly && \
7777
# cleanup
7878
npm remove -y --no-save mocha nyc should supertest && \
7979
apt-get remove -y build-essential libkrb5-dev wget \
80-
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 && \
80+
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 python3-dev python-setuptools && \
8181
apt-get install -y 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 && \
8282
apt-get clean && \
8383
rm -rf /var/lib/apt/lists/* /tmp/* /tmp/.??* /var/tmp/* /var/tmp/.??* ~/.npm ~/.cache && \

bin/docker/modify.sh

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,26 @@ if [ "${COUNTLY_CONTAINER}" != "frontend" ]; then
1717
# Run ab-testing models compilation if it's there
1818
if [ -d /opt/countly/plugins/ab-testing ]; then
1919
if [ "${ID}" == "debian" ] || [ "${ID}" == "ubuntu" ]; then
20-
apt-get install -y python3-pip
20+
echo "Debian noninteractive"
21+
export DEBIAN_FRONTEND=noninteractive
22+
export TZ=Etc/UTC
23+
24+
apt-get -y update
25+
apt-get install -y software-properties-common build-essential python3-dev libncurses*-dev libsqlite3-dev libreadline6-dev libgdbm-dev zlib1g-dev libbz2-dev sqlite3 tk-dev zip libssl-dev libncurses5-dev liblzma-dev lsb-core lsb-release
26+
27+
export LC_ALL="en_US.UTF-8"
28+
export LC_CTYPE="en_US.UTF-8"
29+
export -n CC
30+
export -n CXX
31+
add-apt-repository -y ppa:deadsnakes/ppa
32+
apt -y install python3.12 python3.12-dev
33+
curl -sSL https://bootstrap.pypa.io/get-pip.py -o get-pip.py
34+
python3.12 get-pip.py
2135
else
2236
yum install -y python36 python36-libs python36-devel python36-pip
2337
fi
38+
ln -s /usr/bin/python3 /usr/bin/python
2439
# shellcheck disable=SC1091
25-
python3.8 -m pip install -r /opt/countly/plugins/ab-testing/api/bayesian/requirements.txt
26-
cd /opt/countly/plugins/ab-testing/api/bayesian && python3.8 model.py
40+
python3.12 -m pip install -r "/opt/countly/plugins/ab-testing/api/bayesian/requirements_docker.txt" && sudo python3.12 "/opt/countly/plugins/ab-testing/api/bayesian/models/cmdstanpy_model.py"
2741
fi
2842
fi

0 commit comments

Comments
 (0)