feat: move browser fonts to tools section (#7443)
This way we not only fix Docker images, but also fix `npx playwright install-deps` in virtual machines.
This commit is contained in:
parent
a6421c690b
commit
fe32d38414
1
.github/workflows/publish_canary_docker.yml
vendored
1
.github/workflows/publish_canary_docker.yml
vendored
|
|
@ -9,6 +9,7 @@ on:
|
||||||
- utils/docker/**
|
- utils/docker/**
|
||||||
- browsers.json
|
- browsers.json
|
||||||
- .github/workflows/publish_canary_docker.yml
|
- .github/workflows/publish_canary_docker.yml
|
||||||
|
- src/nativeDeps.ts
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
publish-canary-docker:
|
publish-canary-docker:
|
||||||
|
|
|
||||||
|
|
@ -26,6 +26,15 @@ export const deps = {
|
||||||
'xvfb',
|
'xvfb',
|
||||||
'fonts-noto-color-emoji',
|
'fonts-noto-color-emoji',
|
||||||
'ttf-unifont',
|
'ttf-unifont',
|
||||||
|
'libfontconfig',
|
||||||
|
'libfreetype6',
|
||||||
|
'xfonts-cyrillic',
|
||||||
|
'xfonts-scalable',
|
||||||
|
'fonts-liberation',
|
||||||
|
'fonts-ipafont-gothic',
|
||||||
|
'fonts-wqy-zenhei',
|
||||||
|
'fonts-tlwg-loma-otf',
|
||||||
|
'ttf-ubuntu-font-family',
|
||||||
],
|
],
|
||||||
chromium: [
|
chromium: [
|
||||||
'fonts-liberation',
|
'fonts-liberation',
|
||||||
|
|
@ -136,6 +145,15 @@ export const deps = {
|
||||||
'xvfb',
|
'xvfb',
|
||||||
'fonts-noto-color-emoji',
|
'fonts-noto-color-emoji',
|
||||||
'ttf-unifont',
|
'ttf-unifont',
|
||||||
|
'libfontconfig',
|
||||||
|
'libfreetype6',
|
||||||
|
'xfonts-cyrillic',
|
||||||
|
'xfonts-scalable',
|
||||||
|
'fonts-liberation',
|
||||||
|
'fonts-ipafont-gothic',
|
||||||
|
'fonts-wqy-zenhei',
|
||||||
|
'fonts-tlwg-loma-otf',
|
||||||
|
'ttf-ubuntu-font-family',
|
||||||
],
|
],
|
||||||
chromium: [
|
chromium: [
|
||||||
'fonts-liberation',
|
'fonts-liberation',
|
||||||
|
|
@ -246,6 +264,15 @@ export const deps = {
|
||||||
'xvfb',
|
'xvfb',
|
||||||
'fonts-noto-color-emoji',
|
'fonts-noto-color-emoji',
|
||||||
'ttf-unifont',
|
'ttf-unifont',
|
||||||
|
'libfontconfig',
|
||||||
|
'libfreetype6',
|
||||||
|
'xfonts-cyrillic',
|
||||||
|
'xfonts-scalable',
|
||||||
|
'fonts-liberation',
|
||||||
|
'fonts-ipafont-gothic',
|
||||||
|
'fonts-wqy-zenhei',
|
||||||
|
'fonts-tlwg-loma-otf',
|
||||||
|
'ttf-ubuntu-font-family',
|
||||||
],
|
],
|
||||||
chromium: [
|
chromium: [
|
||||||
'libasound2',
|
'libasound2',
|
||||||
|
|
|
||||||
|
|
@ -21,35 +21,6 @@ RUN apt-get update && apt-get install -y python3.8 python3-pip && \
|
||||||
update-alternatives --install /usr/bin/python python /usr/bin/python3 1 && \
|
update-alternatives --install /usr/bin/python python /usr/bin/python3 1 && \
|
||||||
update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.8 1
|
update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.8 1
|
||||||
|
|
||||||
#================
|
|
||||||
# Font libraries
|
|
||||||
#================
|
|
||||||
# libfontconfig ~1 MB
|
|
||||||
# libfreetype6 ~1 MB
|
|
||||||
# xfonts-cyrillic ~2 MB
|
|
||||||
# xfonts-scalable ~2 MB
|
|
||||||
# fonts-liberation ~3 MB
|
|
||||||
# fonts-ipafont-gothic ~13 MB
|
|
||||||
# fonts-wqy-zenhei ~17 MB
|
|
||||||
# fonts-tlwg-loma-otf ~300 KB
|
|
||||||
# ttf-ubuntu-font-family ~5 MB
|
|
||||||
#
|
|
||||||
# Layer size: small: 36.28 MB (with --no-install-recommends)
|
|
||||||
# Layer size: small: 36.28 MB
|
|
||||||
RUN apt-get -qqy update \
|
|
||||||
&& apt-get -qqy --no-install-recommends install \
|
|
||||||
libfontconfig \
|
|
||||||
libfreetype6 \
|
|
||||||
xfonts-cyrillic \
|
|
||||||
xfonts-scalable \
|
|
||||||
fonts-liberation \
|
|
||||||
fonts-ipafont-gothic \
|
|
||||||
fonts-wqy-zenhei \
|
|
||||||
fonts-tlwg-loma-otf \
|
|
||||||
ttf-ubuntu-font-family \
|
|
||||||
&& rm -rf /var/lib/apt/lists/* \
|
|
||||||
&& apt-get -qyy clean
|
|
||||||
|
|
||||||
# === BAKE BROWSERS INTO IMAGE ===
|
# === BAKE BROWSERS INTO IMAGE ===
|
||||||
|
|
||||||
ENV PLAYWRIGHT_BROWSERS_PATH=/ms-playwright
|
ENV PLAYWRIGHT_BROWSERS_PATH=/ms-playwright
|
||||||
|
|
|
||||||
|
|
@ -21,35 +21,6 @@ RUN apt-get update && apt-get install -y python3.8 python3-pip && \
|
||||||
update-alternatives --install /usr/bin/python python /usr/bin/python3 1 && \
|
update-alternatives --install /usr/bin/python python /usr/bin/python3 1 && \
|
||||||
update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.8 1
|
update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.8 1
|
||||||
|
|
||||||
#================
|
|
||||||
# Font libraries
|
|
||||||
#================
|
|
||||||
# libfontconfig ~1 MB
|
|
||||||
# libfreetype6 ~1 MB
|
|
||||||
# xfonts-cyrillic ~2 MB
|
|
||||||
# xfonts-scalable ~2 MB
|
|
||||||
# fonts-liberation ~3 MB
|
|
||||||
# fonts-ipafont-gothic ~13 MB
|
|
||||||
# fonts-wqy-zenhei ~17 MB
|
|
||||||
# fonts-tlwg-loma-otf ~300 KB
|
|
||||||
# ttf-ubuntu-font-family ~5 MB
|
|
||||||
#
|
|
||||||
# Layer size: small: 36.28 MB (with --no-install-recommends)
|
|
||||||
# Layer size: small: 36.28 MB
|
|
||||||
RUN apt-get -qqy update \
|
|
||||||
&& apt-get -qqy --no-install-recommends install \
|
|
||||||
libfontconfig \
|
|
||||||
libfreetype6 \
|
|
||||||
xfonts-cyrillic \
|
|
||||||
xfonts-scalable \
|
|
||||||
fonts-liberation \
|
|
||||||
fonts-ipafont-gothic \
|
|
||||||
fonts-wqy-zenhei \
|
|
||||||
fonts-tlwg-loma-otf \
|
|
||||||
ttf-ubuntu-font-family \
|
|
||||||
&& rm -rf /var/lib/apt/lists/* \
|
|
||||||
&& apt-get -qyy clean
|
|
||||||
|
|
||||||
# === BAKE BROWSERS INTO IMAGE ===
|
# === BAKE BROWSERS INTO IMAGE ===
|
||||||
|
|
||||||
ENV PLAYWRIGHT_BROWSERS_PATH=/ms-playwright
|
ENV PLAYWRIGHT_BROWSERS_PATH=/ms-playwright
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue