Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

WIP: Update NodeJS and dependencies #22557

Closed
wants to merge 2 commits into from
Closed

WIP: Update NodeJS and dependencies #22557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
511eda3
Switched to nvm instead of outdated nodejs install script, updated to…
ScrewTSW Sep 26, 2023
85ef0fc
Updating dependencies, fixing CheApiRequestHandler and CheMultiuserAu…
ScrewTSW Sep 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions tests/e2e/build/dockerfiles/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
FROM selenium/standalone-chrome:114.0
FROM selenium/standalone-chrome:117.0

ENV DISPLAY=':20'

USER root

RUN apt-get update && apt-get install && \
apt-get install -y ftp x11vnc ffmpeg libvpx6 && \
curl -fsSL https://deb.nodesource.com/setup_16.x | sudo -E bash - && \
apt-get install -y nodejs && \
npm install -g typescript && \
curl -fsSLo- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash && \
export NVM_DIR="$HOME/.nvm" && \
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" && \
nvm install stable && nvm alias default stable && nvm use default && nvm list && \
node -v

COPY --chown=0:0 build/dockerfiles/entrypoint.sh /tmp/
Expand All @@ -21,7 +23,11 @@ RUN sed -i "s/nodaemon=true/nodaemon=false/" /etc/supervisord.conf
COPY package.json package-lock.json /tmp/e2e/

RUN cd /tmp/e2e && \
npm i
export NVM_DIR="$HOME/.nvm" && \
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" && \
nvm use default && \
npm ci

COPY . /tmp/e2e

Expand Down
6 changes: 5 additions & 1 deletion tests/e2e/build/dockerfiles/entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
#!/bin/bash
#!/usr/bin/env bash

EXIT_CODE=0
export NVM_DIR="$HOME/.nvm"
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"
nvm use default

kill_ffmpeg(){
echo "Killing ffmpeg with PID=$ffmpeg_pid"
Expand Down
Loading
Loading