Skip to content

Commit 4eb96ad

Browse files
committed
Merge branch 'release.24.10' into release.24.12
# Conflicts: # CHANGELOG.md
2 parents b5edce1 + b3ca952 commit 4eb96ad

File tree

5 files changed

+84
-126
lines changed

5 files changed

+84
-126
lines changed

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ Enterprise Features:
2727
- [core] Adding support For SingleStore Kai
2828
- [flows] Adding UX improvements to the editor
2929
- [journey_engine] Adding "Journey Engine" feature
30+
- [ldap] Fixed issues that would lead to configuration options not being picked up
3031
- [remote-config] Moving enable/disable functionality to the dropdown
3132
- [surveys] "Select one" text in the widget can be edited now
3233
- [surveys] Removed unnecessary limitation with using cohorts for targeting

Dockerfile-centos-api

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ RUN curl -s -L -o /tmp/tini.rpm "https://github.com/krallin/tini/releases/downlo
4545
yum group install -y "Development Tools" && \
4646
yum install -y epel-release && \
4747
yum install -y 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 xorg-x11-fonts-100dpi xorg-x11-fonts-75dpi xorg-x11-utils xorg-x11-fonts-cyrillic xorg-x11-fonts-Type1 xorg-x11-fonts-misc && \
48-
yum install -y https://pkgs.dyn.su/el8/base/x86_64/raven-release-1.0-2.el8.noarch.rpm && \
48+
yum install -y https://pkgs.sysadmins.ws/el8/base/x86_64/raven-release-1.0-2.el8.noarch.rpm && \
4949
yum install -y wget openssl-devel make git libsqlite* sqlite unzip bzip2 && \
5050
# modify standard distribution
5151
./bin/docker/modify.sh && \
@@ -74,4 +74,4 @@ USER 1001:0
7474

7575
ENTRYPOINT ["/usr/bin/tini", "-v", "--"]
7676

77-
CMD ["/opt/countly/bin/docker/cmd.sh"]
77+
CMD ["/opt/countly/bin/docker/cmd.sh"]

Dockerfile-centos-frontend

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ RUN curl -s -L -o /tmp/tini.rpm "https://github.com/krallin/tini/releases/downlo
4343
yum group install -y "Development Tools" && \
4444
yum install -y epel-release && \
4545
yum install -y 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 xorg-x11-fonts-100dpi xorg-x11-fonts-75dpi xorg-x11-utils xorg-x11-fonts-cyrillic xorg-x11-fonts-Type1 xorg-x11-fonts-misc && \
46-
yum install -y https://pkgs.dyn.su/el8/base/x86_64/raven-release-1.0-2.el8.noarch.rpm && \
46+
yum install -y https://pkgs.sysadmins.ws/el8/base/x86_64/raven-release-1.0-2.el8.noarch.rpm && \
4747
yum install -y wget openssl-devel make git sqlite libsqlite* unzip bzip2 && \
4848
# modify standard distribution
4949
./bin/docker/modify.sh && \

0 commit comments

Comments
 (0)