From 0291176462de7b1c14b8ea82cd2af6b11e79b09a Mon Sep 17 00:00:00 2001 From: Lucas Fernandes da Costa Date: Fri, 14 Jan 2022 14:21:20 +0000 Subject: [PATCH 1/8] fix: add fonts to support more different types of characters for multiple languages [fix #29495] --- .../templates/docker/Dockerfile.elastic-agent.tmpl | 7 ++++++- dev-tools/packaging/templates/docker/Dockerfile.tmpl | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl b/dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl index 644df5bd73a8..27c7474a894b 100644 --- a/dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl +++ b/dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl @@ -69,7 +69,12 @@ RUN apt-get update -y && \ libcairo2\ libasound2\ libatspi2.0-0\ - libxshmfence1 && \ + libxshmfence1 \ + fonts-arphic-ukai \ + fonts-arphic-uming \ + fonts-ipafont-mincho \ + fonts-ipafont-gothic \ + fonts-unfonts-core && \ apt-get clean all && \ exit_code=0 && break || exit_code=$? && echo "apt-get error: retry $iter in 10s" && sleep 10; \ done; \ diff --git a/dev-tools/packaging/templates/docker/Dockerfile.tmpl b/dev-tools/packaging/templates/docker/Dockerfile.tmpl index 9309516bd80a..15b233e66a2a 100644 --- a/dev-tools/packaging/templates/docker/Dockerfile.tmpl +++ b/dev-tools/packaging/templates/docker/Dockerfile.tmpl @@ -59,7 +59,12 @@ RUN apt-get update -y && \ libcairo2\ libasound2\ libatspi2.0-0\ - libxshmfence1 && \ + libxshmfence1 \ + fonts-arphic-ukai \ + fonts-arphic-uming \ + fonts-ipafont-mincho \ + fonts-ipafont-gothic \ + fonts-unfonts-core && \ apt-get clean all && \ exit_code=0 && break || exit_code=$? && echo "apt-get error: retry $iter in 10s" && sleep 10; \ done; \ From 377ab261f69dec6cb8e8eef9d92e0589b220f2c2 Mon Sep 17 00:00:00 2001 From: Lucas Fernandes da Costa Date: Fri, 14 Jan 2022 14:21:20 +0000 Subject: [PATCH 2/8] fix: add fonts to support more different types of characters for multiple languages [fix #29495] --- CHANGELOG.next.asciidoc | 1 + .../templates/docker/Dockerfile.elastic-agent.tmpl | 7 ++++++- dev-tools/packaging/templates/docker/Dockerfile.tmpl | 7 ++++++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index e78e1bc7bce4..3ec1b9bcad73 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -49,6 +49,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d *Heartbeat* - Only add monitor.status to browser events when summary. {pull}29460[29460] - Also add summary to journeys for which the synthetics runner crashes. {pull}29606[29606] +- Add fonts to support more different types of characters for multiple languages. {pull}29606[29861] *Metricbeat* diff --git a/dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl b/dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl index 644df5bd73a8..27c7474a894b 100644 --- a/dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl +++ b/dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl @@ -69,7 +69,12 @@ RUN apt-get update -y && \ libcairo2\ libasound2\ libatspi2.0-0\ - libxshmfence1 && \ + libxshmfence1 \ + fonts-arphic-ukai \ + fonts-arphic-uming \ + fonts-ipafont-mincho \ + fonts-ipafont-gothic \ + fonts-unfonts-core && \ apt-get clean all && \ exit_code=0 && break || exit_code=$? && echo "apt-get error: retry $iter in 10s" && sleep 10; \ done; \ diff --git a/dev-tools/packaging/templates/docker/Dockerfile.tmpl b/dev-tools/packaging/templates/docker/Dockerfile.tmpl index 9309516bd80a..15b233e66a2a 100644 --- a/dev-tools/packaging/templates/docker/Dockerfile.tmpl +++ b/dev-tools/packaging/templates/docker/Dockerfile.tmpl @@ -59,7 +59,12 @@ RUN apt-get update -y && \ libcairo2\ libasound2\ libatspi2.0-0\ - libxshmfence1 && \ + libxshmfence1 \ + fonts-arphic-ukai \ + fonts-arphic-uming \ + fonts-ipafont-mincho \ + fonts-ipafont-gothic \ + fonts-unfonts-core && \ apt-get clean all && \ exit_code=0 && break || exit_code=$? && echo "apt-get error: retry $iter in 10s" && sleep 10; \ done; \ From ea0dcfea4a3e49a04ffc2c0b293e555f5efa6d06 Mon Sep 17 00:00:00 2001 From: Andrew Cholakian Date: Wed, 26 Jan 2022 18:48:19 -0600 Subject: [PATCH 3/8] Prefer noto fonts --- .../templates/docker/Dockerfile.elastic-agent.tmpl | 8 +++----- dev-tools/packaging/templates/docker/Dockerfile.tmpl | 7 ++----- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl b/dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl index 27c7474a894b..772817f4202b 100644 --- a/dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl +++ b/dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl @@ -70,15 +70,13 @@ RUN apt-get update -y && \ libasound2\ libatspi2.0-0\ libxshmfence1 \ - fonts-arphic-ukai \ - fonts-arphic-uming \ - fonts-ipafont-mincho \ - fonts-ipafont-gothic \ - fonts-unfonts-core && \ + fonts-noto-core\ + fonts-noto-cjk &&\ apt-get clean all && \ exit_code=0 && break || exit_code=$? && echo "apt-get error: retry $iter in 10s" && sleep 10; \ done; \ (exit $exit_code) +RUN apt install fonts-noto-cjk ENV NODE_PATH={{ $beatHome }}/.node RUN echo \ $NODE_PATH \ diff --git a/dev-tools/packaging/templates/docker/Dockerfile.tmpl b/dev-tools/packaging/templates/docker/Dockerfile.tmpl index 15b233e66a2a..fec54d5ccb11 100644 --- a/dev-tools/packaging/templates/docker/Dockerfile.tmpl +++ b/dev-tools/packaging/templates/docker/Dockerfile.tmpl @@ -60,11 +60,8 @@ RUN apt-get update -y && \ libasound2\ libatspi2.0-0\ libxshmfence1 \ - fonts-arphic-ukai \ - fonts-arphic-uming \ - fonts-ipafont-mincho \ - fonts-ipafont-gothic \ - fonts-unfonts-core && \ + fonts-noto \ + fonts-noto-cjk && \ apt-get clean all && \ exit_code=0 && break || exit_code=$? && echo "apt-get error: retry $iter in 10s" && sleep 10; \ done; \ From 10096cb7ce52fb1b847d559ee207760d4f5c26d1 Mon Sep 17 00:00:00 2001 From: Lucas Fernandes da Costa Date: Fri, 14 Jan 2022 14:21:20 +0000 Subject: [PATCH 4/8] fix: add fonts to support more different types of characters for multiple languages [fix #29495] --- .../templates/docker/Dockerfile.elastic-agent.tmpl | 7 ++++++- dev-tools/packaging/templates/docker/Dockerfile.tmpl | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl b/dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl index 644df5bd73a8..27c7474a894b 100644 --- a/dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl +++ b/dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl @@ -69,7 +69,12 @@ RUN apt-get update -y && \ libcairo2\ libasound2\ libatspi2.0-0\ - libxshmfence1 && \ + libxshmfence1 \ + fonts-arphic-ukai \ + fonts-arphic-uming \ + fonts-ipafont-mincho \ + fonts-ipafont-gothic \ + fonts-unfonts-core && \ apt-get clean all && \ exit_code=0 && break || exit_code=$? && echo "apt-get error: retry $iter in 10s" && sleep 10; \ done; \ diff --git a/dev-tools/packaging/templates/docker/Dockerfile.tmpl b/dev-tools/packaging/templates/docker/Dockerfile.tmpl index 9309516bd80a..15b233e66a2a 100644 --- a/dev-tools/packaging/templates/docker/Dockerfile.tmpl +++ b/dev-tools/packaging/templates/docker/Dockerfile.tmpl @@ -59,7 +59,12 @@ RUN apt-get update -y && \ libcairo2\ libasound2\ libatspi2.0-0\ - libxshmfence1 && \ + libxshmfence1 \ + fonts-arphic-ukai \ + fonts-arphic-uming \ + fonts-ipafont-mincho \ + fonts-ipafont-gothic \ + fonts-unfonts-core && \ apt-get clean all && \ exit_code=0 && break || exit_code=$? && echo "apt-get error: retry $iter in 10s" && sleep 10; \ done; \ From 644a0fcbf7c0885f067e80f0391e59b75f535608 Mon Sep 17 00:00:00 2001 From: Lucas Fernandes da Costa Date: Fri, 14 Jan 2022 14:21:20 +0000 Subject: [PATCH 5/8] fix: add fonts to support more different types of characters for multiple languages [fix #29495] --- CHANGELOG.next.asciidoc | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 81271742fd1f..852210cd9000 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -53,6 +53,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - Only add monitor.status to browser events when summary. {pull}29460[29460] - Also add summary to journeys for which the synthetics runner crashes. {pull}29606[29606] - Update size of ICMP packets to adhere to standard min size. {pull}29948[29948] +- Add fonts to support more different types of characters for multiple languages. {pull}29606[29861] *Metricbeat* From 1518c194c4d5cded2576229f275105e4010282b7 Mon Sep 17 00:00:00 2001 From: Andrew Cholakian Date: Wed, 26 Jan 2022 18:48:19 -0600 Subject: [PATCH 6/8] Prefer noto fonts --- .../templates/docker/Dockerfile.elastic-agent.tmpl | 8 +++----- dev-tools/packaging/templates/docker/Dockerfile.tmpl | 7 ++----- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl b/dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl index 27c7474a894b..772817f4202b 100644 --- a/dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl +++ b/dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl @@ -70,15 +70,13 @@ RUN apt-get update -y && \ libasound2\ libatspi2.0-0\ libxshmfence1 \ - fonts-arphic-ukai \ - fonts-arphic-uming \ - fonts-ipafont-mincho \ - fonts-ipafont-gothic \ - fonts-unfonts-core && \ + fonts-noto-core\ + fonts-noto-cjk &&\ apt-get clean all && \ exit_code=0 && break || exit_code=$? && echo "apt-get error: retry $iter in 10s" && sleep 10; \ done; \ (exit $exit_code) +RUN apt install fonts-noto-cjk ENV NODE_PATH={{ $beatHome }}/.node RUN echo \ $NODE_PATH \ diff --git a/dev-tools/packaging/templates/docker/Dockerfile.tmpl b/dev-tools/packaging/templates/docker/Dockerfile.tmpl index 15b233e66a2a..fec54d5ccb11 100644 --- a/dev-tools/packaging/templates/docker/Dockerfile.tmpl +++ b/dev-tools/packaging/templates/docker/Dockerfile.tmpl @@ -60,11 +60,8 @@ RUN apt-get update -y && \ libasound2\ libatspi2.0-0\ libxshmfence1 \ - fonts-arphic-ukai \ - fonts-arphic-uming \ - fonts-ipafont-mincho \ - fonts-ipafont-gothic \ - fonts-unfonts-core && \ + fonts-noto \ + fonts-noto-cjk && \ apt-get clean all && \ exit_code=0 && break || exit_code=$? && echo "apt-get error: retry $iter in 10s" && sleep 10; \ done; \ From 44327fff4453ce04f916eeab70518a1d5a0db68f Mon Sep 17 00:00:00 2001 From: Andrew Cholakian Date: Thu, 27 Jan 2022 16:00:04 -0600 Subject: [PATCH 7/8] Remove redundant font install --- .../packaging/templates/docker/Dockerfile.elastic-agent.tmpl | 1 - 1 file changed, 1 deletion(-) diff --git a/dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl b/dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl index 772817f4202b..31ca7e78da2f 100644 --- a/dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl +++ b/dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl @@ -76,7 +76,6 @@ RUN apt-get update -y && \ exit_code=0 && break || exit_code=$? && echo "apt-get error: retry $iter in 10s" && sleep 10; \ done; \ (exit $exit_code) -RUN apt install fonts-noto-cjk ENV NODE_PATH={{ $beatHome }}/.node RUN echo \ $NODE_PATH \ From 668449d154e3276145065c5af67b434fc69ab0af Mon Sep 17 00:00:00 2001 From: Andrew Cholakian Date: Thu, 27 Jan 2022 16:00:48 -0600 Subject: [PATCH 8/8] Remove redundant font install --- .../packaging/templates/docker/Dockerfile.elastic-agent.tmpl | 1 - 1 file changed, 1 deletion(-) diff --git a/dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl b/dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl index 772817f4202b..31ca7e78da2f 100644 --- a/dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl +++ b/dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl @@ -76,7 +76,6 @@ RUN apt-get update -y && \ exit_code=0 && break || exit_code=$? && echo "apt-get error: retry $iter in 10s" && sleep 10; \ done; \ (exit $exit_code) -RUN apt install fonts-noto-cjk ENV NODE_PATH={{ $beatHome }}/.node RUN echo \ $NODE_PATH \