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

[docker] add reporting fonts #74806

Merged
merged 11 commits into from
Oct 6, 2020
Merged

[docker] add reporting fonts #74806

Changes from 5 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
afb9a89
[docker] include noto-cjk
jbudz Aug 11, 2020
911b865
tmp build docker - revert me before merging
jbudz Aug 11, 2020
f7509a0
Merge branch 'master' into docker/fonts
elasticmachine Aug 13, 2020
9bd0454
Merge branch 'master' into docker/fonts
jbudz Aug 17, 2020
21e2f4c
Revert "tmp build docker - revert me before merging"
jbudz Aug 17, 2020
f2fedcd
fix missing newline
jbudz Aug 24, 2020
0c70a45
use common fonts to avoid ambiguity between which
jbudz Aug 24, 2020
a1becf3
Merge branch 'master' into docker/fonts
jbudz Sep 2, 2020
813b581
Revert "use common fonts to avoid ambiguity between which"
jbudz Sep 2, 2020
8a5b591
Merge branch 'master' into docker/fonts
jbudz Oct 5, 2020
e795c9b
fix font paths
jbudz Oct 5, 2020
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
6 changes: 6 additions & 0 deletions src/dev/build/tasks/os_packages/docker_generator/templates/dockerfile.template.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,12 @@ function generator({
# Add Reporting dependencies.
RUN ${packageManager()} update -y && ${packageManager()} install -y fontconfig freetype shadow-utils && ${packageManager()} clean all


RUN cd /usr/local/share/fonts/ \
&& curl-L -o "https://github.com/googlefonts/noto-cjk/raw/NotoSansV2.001/NotoSansCJK-Regular.ttc" \
&& fc-cache -f -v
Copy link
Contributor

Choose a reason for hiding this comment

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

There is missing a \ for the newline here.

&& cd -

# Add an init process, check the checksum to make sure it's a match
RUN curl -L -o /usr/local/bin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.2/dumb-init_1.2.2_amd64
RUN echo "37f2c1f0372a45554f1b89924fbb134fc24c3756efaedf11e07f599494e0eff9 /usr/local/bin/dumb-init" | sha256sum -c -
Expand Down