Update install script

TIOJ-INFOR-Online-Judge · Sep 1, 2023 · 53fd7c7 · 53fd7c7
1 parent b9f8ae4
commit 53fd7c7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -3,9 +3,12 @@ FROM ruby:3.1.2
 RUN apt update && apt upgrade -y
 
 # Yarn & nodejs setup
-RUN curl -sL https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor | tee /usr/share/keyrings/yarnkey.gpg >/dev/null
+RUN curl -sL https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor -o /usr/share/keyrings/yarnkey.gpg
+RUN mkdir -p /etc/apt/keyrings
+RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
 RUN echo "deb [signed-by=/usr/share/keyrings/yarnkey.gpg] https://dl.yarnpkg.com/debian stable main" | tee /etc/apt/sources.list.d/yarn.list
-RUN curl -fsSL https://deb.nodesource.com/setup_19.x | bash -
+RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list
+RUN apt update -y
 RUN apt install -y rsync netcat nodejs yarn redis-server --no-install-recommends
 
 ARG MYSQL_ROOT_PASSWORD

diff --git a/scripts/install.sh b/scripts/install.sh
@@ -29,12 +29,15 @@ if grep -q 'Ubuntu' /etc/*-release; then
   sudo apt -y update
   sudo apt -y install software-properties-common
   sudo apt-add-repository -y ppa:rael-gc/rvm
-  curl -sL https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor | sudo tee /usr/share/keyrings/yarnkey.gpg >/dev/null
+  sudo mkdir -p /etc/apt/keyrings
+  curl -sL https://dl.yarnpkg.com/debian/pubkey.gpg | sudo gpg --dearmor -o /usr/share/keyrings/yarnkey.gpg
+  curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | sudo gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
   echo "deb [signed-by=/usr/share/keyrings/yarnkey.gpg] https://dl.yarnpkg.com/debian stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
-  curl -fsSL https://deb.nodesource.com/setup_19.x | sudo -E bash -
+  echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | sudo tee /etc/apt/sources.list.d/nodesource.list
   if [ "$UBUNTU_DIST" != "22.04" ]; then
     sudo apt-add-repository -y ppa:ubuntu-toolchain-r/test
   fi
+  sudo apt -y update
   sudo DEBIAN_FRONTEND=noninteractive apt -y install \
       git cmake ninja-build g++-11 rvm \
       mysql-server mysql-client libmysqlclient-dev libcurl4-openssl-dev \