chore(preview-service): fix docker compose to avoid pinning chrome (#3030)

This commit is contained in:
Iain Sproat 2024-09-18 12:32:45 +01:00 коммит произвёл GitHub
Родитель 00c01db923
Коммит 0881caadc8
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: B5690EEEBB952194
1 изменённых файлов: 36 добавлений и 15 удалений

Просмотреть файл

@ -41,24 +41,13 @@ RUN yarn workspaces foreach -W run build
FROM --platform=linux/amd64 node:18-bookworm-slim@sha256:408f8cbbb7b33a5bb94bdb8862795a94d2b64c2d516856824fd86c4a5594a443 AS node
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
# hadolint ignore=DL3008,DL3015
RUN apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install -y \
# --no-install-recommends # This is causing issues with the google-chrome-stable install as not all gpg components are installed if recommended installs are disabled
tini=0.19.0-1 \
# wget has different versions for different architectures
wget \
gnupg=2.2.40-1.1 && \
# Clean up
apt-get clean && \
rm -rf /var/lib/apt/lists/* && \
wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | gpg --dearmor -o /usr/share/keyrings/googlechrome-linux-keyring.gpg && \
sh -c 'echo "deb [arch=amd64 signed-by=/usr/share/keyrings/googlechrome-linux-keyring.gpg] https://dl-ssl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list'
# Install Chrome and fonts
# Install tini and fonts
RUN apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install -y \
--no-install-recommends \
google-chrome-stable=128.0.6613.137-1 \
# up to date ca-certs are required for downloading the google signing key
ca-certificates=20230311 \
tini=0.19.0-1 \
fonts-ipafont-gothic=00303-23 \
fonts-wqy-zenhei=0.9.45-8 \
fonts-thai-tlwg=1:0.7.3-1 \
@ -68,6 +57,14 @@ RUN apt-get update && \
# Clean up
apt-get clean && \
rm -rf /var/lib/apt/lists/*
# hadolint ignore=DL3015
RUN apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install -y \
# --no-install-recommends # This is causing issues with the google-chrome-stable install as not all gpg components are installed if recommended installs are disabled
gnupg=2.2.40-1.1 && \
# Clean up
apt-get clean && \
rm -rf /var/lib/apt/lists/*
COPY --from=build-stage /speckle-server/wait /wait
@ -101,6 +98,30 @@ RUN groupadd -g 30000 -r pptruser && \
chown -R pptruser:pptruser ./node_modules && \
chown -R pptruser:pptruser ./package.json
# overriding this value via `--build-arg CACHE_BUST=$(date +%s)` will cause the latest google chrome to be fetched
ARG CACHE_BUST=1
# install google chrome
# hadolint ignore=DL3008
RUN apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install -y \
--no-install-recommends \
# wget has different versions for different architectures so we cannot pin version
wget && \
wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | gpg --dearmor -o /usr/share/keyrings/googlechrome-linux-keyring.gpg && \
sh -c 'echo "deb [arch=amd64 signed-by=/usr/share/keyrings/googlechrome-linux-keyring.gpg] https://dl-ssl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list' && \
# remove wget after use
DEBIAN_FRONTEND=noninteractive apt-get remove -y \
wget && \
# update packages in order to use google chrome repo
apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install -y \
--no-install-recommends \
google-chrome-stable && \
# Clean up
apt-get clean && \
rm -rf /var/lib/apt/lists/*
# Run everything after as non-privileged user.
USER pptruser