diff --git a/Dockerfile.amd64 b/Dockerfile.amd64 index a5841ce..3b282c8 100644 --- a/Dockerfile.amd64 +++ b/Dockerfile.amd64 @@ -32,6 +32,14 @@ RUN apt update \ && apt autoremove -y \ && rm -rf /var/lib/apt/lists/* +RUN apt update \ + && apt install -y gpg-agent \ + && curl -LO https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb \ + && (dpkg -i ./google-chrome-stable_current_amd64.deb || apt-get install -fy) \ + && curl -sSL https://dl.google.com/linux/linux_signing_key.pub | apt-key add \ + && rm google-chrome-stable_current_amd64.deb \ + && rm -rf /var/lib/apt/lists/* + RUN apt update \ && apt install -y --no-install-recommends --allow-unauthenticated \ lxde gtk2-engines-murrine gnome-themes-standard gtk2-engines-pixbuf gtk2-engines-murrine arc-theme \ @@ -39,15 +47,6 @@ RUN apt update \ && apt autoremove -y \ && rm -rf /var/lib/apt/lists/* -RUN sed -i 's#http://archive.ubuntu.com/ubuntu/#mirror://mirrors.ubuntu.com/mirrors.txt#' /etc/apt/sources.list; - -RUN apt update \ - && apt install -y ca-certificates gnupg patch gpg-agent \ - && curl -LO https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb \ - && (dpkg -i ./google-chrome-stable_current_amd64.deb || apt-get install -fy) \ - && curl -sSL https://dl.google.com/linux/linux_signing_key.pub | apt-key add \ - && rm google-chrome-stable_current_amd64.deb \ - && rm -rf /var/lib/apt/lists/* # Additional packages require ~600MB # libreoffice pinta language-pack-zh-hant language-pack-gnome-zh-hant firefox-locale-zh-hant libreoffice-l10n-zh-tw @@ -127,4 +126,4 @@ WORKDIR /root ENV HOME=/home/ubuntu \ SHELL=/bin/bash HEALTHCHECK --interval=30s --timeout=5s CMD curl --fail http://127.0.0.1:6079/api/health -ENTRYPOINT ["/startup.sh"] +ENTRYPOINT ["/startup.sh"] \ No newline at end of file