Skip to content

Stop shipping build-only deps and drop deprecated apt-key #8

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

Open
soulgalore wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Stop shipping build-only deps and drop deprecated apt-key #8

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
FROM sitespeedio/visualmetrics-deps:ffmpeg-7.1.1-b

ARG TARGETPLATFORM
ARG buildDeps="bzip2 gnupg wget curl gpg software-properties-common unzip"

ENV LC_ALL=C
ENV DEBIAN_FRONTEND=noninteractive
Expand All @@ -26,7 +27,6 @@ COPY firefox/firefox-no-snap /etc/apt/preferences.d/firefox-no-snap
# firefox-locale-hi fonts-gargi # Hindi (for now)

RUN fonts='fonts-ipafont-gothic fonts-ipafont-mincho ttf-wqy-microhei fonts-wqy-microhei fonts-tlwg-loma fonts-tlwg-loma-otf fonts-gargi' && \
buildDeps='bzip2 gnupg wget ca-certificates curl gpg software-properties-common unzip' && \
xvfbDeps='xvfb libgl1-mesa-dri xfonts-100dpi xfonts-75dpi xfonts-scalable xfonts-cyrillic dbus-x11' && \
apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install -y $buildDeps --no-install-recommends && \
Expand All @@ -43,8 +43,9 @@ RUN fonts='fonts-ipafont-gothic fonts-ipafont-mincho ttf-wqy-microhei fonts-wqy-

RUN if [ "$TARGETPLATFORM" = "linux/amd64" ] ; \
then \
wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - && \
echo "deb http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google-chrome.list && \
mkdir -p /etc/apt/keyrings && \
wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | gpg --dearmor > /etc/apt/keyrings/google-chrome.gpg && \
echo "deb [signed-by=/etc/apt/keyrings/google-chrome.gpg] http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google-chrome.list && \
curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > microsoft.gpg && \
install -o root -g root -m 644 microsoft.gpg /etc/apt/trusted.gpg.d/ && \
sh -c 'echo "deb [arch=amd64] https://packages.microsoft.com/repos/edge stable main" > /etc/apt/sources.list.d/microsoft-edge-dev.list' && \
Expand Down
Loading