Browse Source

Merge pull request #15574 from overleaf/mj-docker-base-node

[server-ce/server-pro] Update node installation method

GitOrigin-RevId: dca1608f40bcbc6fdb248d5776e45902b3e17364
Miguel Serrano 2 năm trước cách đây
mục cha
commit
dbf8e6c6ef
1 tập tin đã thay đổi với 7 bổ sung4 xóa
  1. 7 4
      server-ce/Dockerfile-base

+ 7 - 4
server-ce/Dockerfile-base

@@ -10,18 +10,21 @@ ENV TEXMFVAR=/var/lib/sharelatex/tmp/texmf-var
 
 # Update to ensure dependencies are updated
 # ------------------------------------------
-ENV REBUILT_AFTER="2023-08-11"
+ENV REBUILT_AFTER="2023-11-02"
 
 # Install dependencies
 # --------------------
 RUN apt-get update \
 &&  apt-get install -y \
-      build-essential wget net-tools unzip time imagemagick optipng strace nginx git python zlib1g-dev libpcre3-dev gettext-base libwww-perl \
+      build-essential wget net-tools unzip time imagemagick optipng strace nginx git python zlib1g-dev libpcre3-dev gettext-base libwww-perl ca-certificates curl gnupg \
       qpdf \
       aspell aspell-en aspell-af aspell-am aspell-ar aspell-ar-large aspell-bg aspell-bn aspell-br aspell-ca aspell-cs aspell-cy aspell-da aspell-de aspell-de-1901 aspell-el aspell-eo aspell-es aspell-et aspell-eu-es aspell-fa aspell-fo aspell-fr aspell-ga aspell-gl-minimos aspell-gu aspell-he aspell-hi aspell-hr aspell-hsb aspell-hu aspell-hy aspell-id aspell-is aspell-it aspell-kk aspell-kn aspell-ku aspell-lt aspell-lv aspell-ml aspell-mr aspell-nl aspell-no aspell-nr aspell-ns  aspell-pa aspell-pl aspell-pt aspell-pt-br aspell-ro aspell-ru aspell-sk aspell-sl aspell-ss aspell-st aspell-sv aspell-tl aspell-tn aspell-ts aspell-uk aspell-uz aspell-xh aspell-zu \
     \
-# install Node.JS 18
-&&  curl -sSL https://deb.nodesource.com/setup_18.x | bash - \
+# install Node.js https://github.com/nodesource/distributions#nodejs
+&&  mkdir -p /etc/apt/keyrings \
+&&  curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
+&&  echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_18.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \
+&&  apt-get update \
 &&  apt-get install -y nodejs \
     \
 &&  rm -rf \