From f499dbdd36d982ed9d1cda8992105a7014d4e2f4 Mon Sep 17 00:00:00 2001 From: Michael Blow Date: Sun, 20 Jul 2025 22:10:28 -0400 Subject: [PATCH 1/2] MB-67729: Use 'enterprise-analytics' as process name for EA - also prune unused ports - update some logging to be EA branded --- .../scripts/entrypoint.sh | 4 +-- .../enterprise-analytics/scripts/run | 6 ++-- .../enterprise-analytics/Dockerfile.template | 31 ++++--------------- 3 files changed, 11 insertions(+), 30 deletions(-) diff --git a/generate/resources/enterprise-analytics/scripts/entrypoint.sh b/generate/resources/enterprise-analytics/scripts/entrypoint.sh index dfb8edb9..3e4fb8a0 100755 --- a/generate/resources/enterprise-analytics/scripts/entrypoint.sh +++ b/generate/resources/enterprise-analytics/scripts/entrypoint.sh @@ -47,7 +47,7 @@ overridePort "ssl_proxy_upstream_port" if [ ! -w /opt/enterprise-analytics/var -o \ $(find /opt/enterprise-analytics/var -maxdepth 0 -printf '%u') != "couchbase" ]; then echo "/opt/enterprise-analytics/var is not owned and writable by UID 1000" - echo "Aborting as Couchbase Server will likely not run" + echo "Aborting as Enterprise Analytics will likely not run" exit 1 fi fi @@ -58,7 +58,7 @@ overridePort "ssl_proxy_upstream_port" validate_cpu_microarchitecture fi - echo "Starting Couchbase Server -- Web UI available at http://:$restPortValue" + echo "Starting Enterprise Analytics -- Web UI available at http://:$restPortValue" echo "and logs available in /opt/enterprise-analytics/var/lib/couchbase/logs" exec runsvdir -P /etc/service } diff --git a/generate/resources/enterprise-analytics/scripts/run b/generate/resources/enterprise-analytics/scripts/run index 7d376c5c..4033d80b 100755 --- a/generate/resources/enterprise-analytics/scripts/run +++ b/generate/resources/enterprise-analytics/scripts/run @@ -2,7 +2,7 @@ # If HOME is set, Erlang requires that it be a writable directory. # We can't guarantee that as it depends on which UID the container -# is started as. The couchbase-server script will handle it being +# is started as. The enterprise-analytics script will handle it being # unset, though, so do that for safety. unset HOME @@ -32,7 +32,7 @@ fi unset container_user if [ "$(whoami)" = "couchbase" ]; then - exec /opt/enterprise-analytics/bin/couchbase-server -- -kernel global_enable_tracing false -noinput + exec /opt/enterprise-analytics/bin/enterprise-analytics -- -kernel global_enable_tracing false -noinput else - exec chpst -ucouchbase /opt/enterprise-analytics/bin/couchbase-server -- -kernel global_enable_tracing false -noinput + exec chpst -ucouchbase /opt/enterprise-analytics/bin/enterprise-analytics -- -kernel global_enable_tracing false -noinput fi diff --git a/generate/templates/enterprise-analytics/Dockerfile.template b/generate/templates/enterprise-analytics/Dockerfile.template index 298e200e..90f370ef 100644 --- a/generate/templates/enterprise-analytics/Dockerfile.template +++ b/generate/templates/enterprise-analytics/Dockerfile.template @@ -107,41 +107,22 @@ COPY scripts/entrypoint.sh / ENTRYPOINT ["/entrypoint.sh"] CMD ["enterprise-analytics"] -# 8091: Cluster administration REST/HTTP traffic, including Couchbase Web Console -# 8092: Views and XDCR access -# 8093: Query service REST/HTTP traffic -# 8094: Search Service REST/HTTP traffic -# 8095: Analytics service REST/HTTP traffic -# 8096: Eventing service REST/HTTP traffic -# 8097: Backup service REST/HTTP traffic -# 9123: Analytics prometheus +# 8091: Cluster administration REST/HTTP traffic, including Web Console +# 8095: Enterprise Analytics service REST/HTTP traffic +# 9123: Enterprise Analytics prometheus # 11207: Data Service (SSL) # 11210: Data Service # 11280: Data Service prometheus -# 18091: Cluster administration REST/HTTP traffic, including Couchbase Web Console (SSL) +# 18091: Cluster administration REST/HTTP traffic, including Web Console (SSL) # 18092: Views and XDCR access (SSL) -# 18093: Query service REST/HTTP traffic (SSL) -# 18094: Search Service REST/HTTP traffic (SSL) -# 18095: Analytics service REST/HTTP traffic (SSL) -# 18096: Eventing service REST/HTTP traffic (SSL) -# 18097: Backup service REST/HTTP traffic (SSL) +# 18095: Enterprise Analytics service REST/HTTP traffic (SSL) EXPOSE 8091 \ - 8092 \ - 8093 \ - 8094 \ 8095 \ - 8096 \ - 8097 \ 9123 \ 11207 \ 11210 \ 11280 \ 18091 \ - 18092 \ - 18093 \ - 18094 \ - 18095 \ - 18096 \ - 18097 + 18095 VOLUME /opt/enterprise-analytics/var From 881a1986215ca123a3a1df3f3bcce1bdaaf1e1e2 Mon Sep 17 00:00:00 2001 From: Michael Blow Date: Mon, 21 Jul 2025 10:42:31 -0400 Subject: [PATCH 2/2] Revert changes re: enterprise-analytics process name --- generate/resources/enterprise-analytics/scripts/run | 6 +++--- generate/templates/enterprise-analytics/Dockerfile.template | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/generate/resources/enterprise-analytics/scripts/run b/generate/resources/enterprise-analytics/scripts/run index 4033d80b..7d376c5c 100755 --- a/generate/resources/enterprise-analytics/scripts/run +++ b/generate/resources/enterprise-analytics/scripts/run @@ -2,7 +2,7 @@ # If HOME is set, Erlang requires that it be a writable directory. # We can't guarantee that as it depends on which UID the container -# is started as. The enterprise-analytics script will handle it being +# is started as. The couchbase-server script will handle it being # unset, though, so do that for safety. unset HOME @@ -32,7 +32,7 @@ fi unset container_user if [ "$(whoami)" = "couchbase" ]; then - exec /opt/enterprise-analytics/bin/enterprise-analytics -- -kernel global_enable_tracing false -noinput + exec /opt/enterprise-analytics/bin/couchbase-server -- -kernel global_enable_tracing false -noinput else - exec chpst -ucouchbase /opt/enterprise-analytics/bin/enterprise-analytics -- -kernel global_enable_tracing false -noinput + exec chpst -ucouchbase /opt/enterprise-analytics/bin/couchbase-server -- -kernel global_enable_tracing false -noinput fi diff --git a/generate/templates/enterprise-analytics/Dockerfile.template b/generate/templates/enterprise-analytics/Dockerfile.template index 90f370ef..76a3ce6a 100644 --- a/generate/templates/enterprise-analytics/Dockerfile.template +++ b/generate/templates/enterprise-analytics/Dockerfile.template @@ -114,7 +114,6 @@ CMD ["enterprise-analytics"] # 11210: Data Service # 11280: Data Service prometheus # 18091: Cluster administration REST/HTTP traffic, including Web Console (SSL) -# 18092: Views and XDCR access (SSL) # 18095: Enterprise Analytics service REST/HTTP traffic (SSL) EXPOSE 8091 \ 8095 \