Skip to content

Commit 53fd7c7

Browse files
committed
Update install script
1 parent b9f8ae4 commit 53fd7c7

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

Dockerfile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,12 @@ FROM ruby:3.1.2
33
RUN apt update && apt upgrade -y
44

55
# Yarn & nodejs setup
6-
RUN curl -sL https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor | tee /usr/share/keyrings/yarnkey.gpg >/dev/null
6+
RUN curl -sL https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor -o /usr/share/keyrings/yarnkey.gpg
7+
RUN mkdir -p /etc/apt/keyrings
8+
RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
79
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
8-
RUN curl -fsSL https://deb.nodesource.com/setup_19.x | bash -
10+
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
11+
RUN apt update -y
912
RUN apt install -y rsync netcat nodejs yarn redis-server --no-install-recommends
1013

1114
ARG MYSQL_ROOT_PASSWORD

scripts/install.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,15 @@ if grep -q 'Ubuntu' /etc/*-release; then
2929
sudo apt -y update
3030
sudo apt -y install software-properties-common
3131
sudo apt-add-repository -y ppa:rael-gc/rvm
32-
curl -sL https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor | sudo tee /usr/share/keyrings/yarnkey.gpg >/dev/null
32+
sudo mkdir -p /etc/apt/keyrings
33+
curl -sL https://dl.yarnpkg.com/debian/pubkey.gpg | sudo gpg --dearmor -o /usr/share/keyrings/yarnkey.gpg
34+
curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | sudo gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
3335
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
34-
curl -fsSL https://deb.nodesource.com/setup_19.x | sudo -E bash -
36+
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
3537
if [ "$UBUNTU_DIST" != "22.04" ]; then
3638
sudo apt-add-repository -y ppa:ubuntu-toolchain-r/test
3739
fi
40+
sudo apt -y update
3841
sudo DEBIAN_FRONTEND=noninteractive apt -y install \
3942
git cmake ninja-build g++-11 rvm \
4043
mysql-server mysql-client libmysqlclient-dev libcurl4-openssl-dev \

0 commit comments

Comments
 (0)