From fd3c918f19584ab6ac6881d2f5cca068d2cb626b Mon Sep 17 00:00:00 2001 From: Aevann Date: Sat, 21 Jan 2023 02:14:36 +0200 Subject: [PATCH] remove node shit --- .gitignore | 4 ---- Dockerfile | 12 ------------ env | 2 -- startup_chat.sh | 8 -------- ubuntu_setup.sh | 15 --------------- 5 files changed, 41 deletions(-) diff --git a/.gitignore b/.gitignore index 77f03b913..28823f5f2 100644 --- a/.gitignore +++ b/.gitignore @@ -5,7 +5,3 @@ __pycache__/ .idea/ .vscode/ .DS_Store - -# Chat environment -chat/node_modules -chat/build diff --git a/Dockerfile b/Dockerfile index c9d85b6af..852fea752 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,18 +26,6 @@ RUN mkdir /asset_submissions/marseys/original RUN mkdir /asset_submissions/hats/original RUN mkdir /var/log/rdrama -ENV NODE_VERSION=16.13.0 -RUN apt install -y curl -RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.0/install.sh | bash -ENV NVM_DIRECTORY=/root/.nvm -RUN . "$NVM_DIRECTORY/nvm.sh" && nvm install ${NODE_VERSION} -RUN . "$NVM_DIRECTORY/nvm.sh" && nvm use v${NODE_VERSION} -RUN . "$NVM_DIRECTORY/nvm.sh" && nvm alias default v${NODE_VERSION} -ENV PATH="/root/.nvm/versions/node/v${NODE_VERSION}/bin/:${PATH}" -RUN node --version -RUN npm --version -RUN npm i -g yarn - RUN apt install -y nginx RUN rm /etc/nginx/sites-available -r RUN rm /etc/nginx/sites-enabled/default diff --git a/env b/env index 6929f0783..68000b971 100644 --- a/env +++ b/env @@ -20,5 +20,3 @@ export MAILGUN_KEY="blahblahblah" export CF_KEY="blahblahblah" export CF_ZONE="blahblahblah" export DEBIAN_FRONTEND="noninteractive" -export NODE_VERSION="16.13.0" -export NVM_DIRECTORY="/root/.nvm" diff --git a/startup_chat.sh b/startup_chat.sh index 603de1f97..5ba7c02e6 100644 --- a/startup_chat.sh +++ b/startup_chat.sh @@ -1,13 +1,5 @@ #!/bin/bash cd /rDrama - . ./.env -PATH="${NVM_DIRECTORY}/versions/node/v${NODE_VERSION}/bin/:${PATH}" - -cd ./chat -yarn install -yarn chat -cd .. - gunicorn files.__main__:app load_chat -k geventwebsocket.gunicorn.workers.GeventWebSocketWorker -w 1 -b 0.0.0.0:5001 diff --git a/ubuntu_setup.sh b/ubuntu_setup.sh index 538828fd2..6e2cf5733 100644 --- a/ubuntu_setup.sh +++ b/ubuntu_setup.sh @@ -36,16 +36,6 @@ psql -U postgres -f schema.sql postgres psql -U postgres -f seed-db.sql postgres pip3 install -r requirements.txt -apt -y install curl -curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.0/install.sh | bash -. "$NVM_DIRECTORY/nvm.sh" && nvm install ${NODE_VERSION} -. "$NVM_DIRECTORY/nvm.sh" && nvm use v${NODE_VERSION} -. "$NVM_DIRECTORY/nvm.sh" && nvm alias default v${NODE_VERSION} -PATH="/root/.nvm/versions/node/v${NODE_VERSION}/bin/:${PATH}" -node --version -npm --version -npm i -g yarn - mkdir /images mkdir /songs mkdir /videos @@ -90,9 +80,4 @@ echo "tmux -S /tmp/s a -t 0" > /c echo "tmux -S /tmp/s a -t 1" > /c2 echo "cd /rDrama && git pull" > /g -cd ./chat -yarn install -yarn chat -cd .. - . imei.sh