Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add fonts to support more different types of characters for multiple languages #29861

Merged
merged 10 commits into from
Jan 28, 2022
+7 −2
Merged

Add fonts to support more different types of characters for multiple languages #29861

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0291176
fix: add fonts to support more different types of characters for mult…
lucasfcosta Jan 14, 2022
377ab26
fix: add fonts to support more different types of characters for mult…
lucasfcosta Jan 14, 2022
ea0dcfe
Prefer noto fonts
andrewvc Jan 27, 2022
6ee5938
Merge remote-tracking branch 'lucas/install-fonts' into install-fonts
andrewvc Jan 27, 2022
10096cb
fix: add fonts to support more different types of characters for mult…
lucasfcosta Jan 14, 2022
644a0fc
fix: add fonts to support more different types of characters for mult…
lucasfcosta Jan 14, 2022
1518c19
Prefer noto fonts
andrewvc Jan 27, 2022
44327ff
Remove redundant font install
andrewvc Jan 27, 2022
f1c91ff
Merge branch 'install-fonts' of github.com:lucasfcosta/beats into ins…
andrewvc Jan 27, 2022
668449d
Remove redundant font install
andrewvc Jan 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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*

Expand Down
5 changes: 4 additions & 1 deletion dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,14 @@ RUN apt-get update -y && \
libcairo2\
libasound2\
libatspi2.0-0\
libxshmfence1 && \
libxshmfence1 \
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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we explicitly install the fonts on elastic-agent image and not on the HB image?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah, that's a bug, it's actually installed higher up, this is redundant

ENV NODE_PATH={{ $beatHome }}/.node
RUN echo \
$NODE_PATH \
Expand Down
4 changes: 3 additions & 1 deletion dev-tools/packaging/templates/docker/Dockerfile.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,9 @@ RUN apt-get update -y && \
libcairo2\
libasound2\
libatspi2.0-0\
libxshmfence1 && \
libxshmfence1 \
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; \
Expand Down