Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
4 changes: 2 additions & 2 deletions .evergreen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4112,9 +4112,9 @@ functions:
set -e
{
source .evergreen/setup-env.sh
(cd scripts/docker && docker build -t ubuntu22.04-xvfb -f ubuntu22.04-xvfb.Dockerfile .)
(cd scripts/docker && docker build --build-arg NODE_JS_VERSION=${NODE_JS_VERSION} -t ubuntu24.04-xvfb -f ubuntu24.04-xvfb.Dockerfile .)
docker run \
--rm -v $PWD:/tmp/build ubuntu22.04-xvfb \
--rm -v $PWD:/tmp/build ubuntu24.04-xvfb \
-c 'cd /tmp/build && ./testing/test-vscode.sh'
}
test_connectivity:
Expand Down
4 changes: 2 additions & 2 deletions .evergreen/evergreen.yml.in
Original file line number Diff line number Diff line change
Expand Up @@ -331,9 +331,9 @@ functions:
set -e
{
source .evergreen/setup-env.sh
(cd scripts/docker && docker build -t ubuntu22.04-xvfb -f ubuntu22.04-xvfb.Dockerfile .)
(cd scripts/docker && docker build --build-arg NODE_JS_VERSION=${NODE_JS_VERSION} -t ubuntu24.04-xvfb -f ubuntu24.04-xvfb.Dockerfile .)
docker run \
--rm -v $PWD:/tmp/build ubuntu22.04-xvfb \
--rm -v $PWD:/tmp/build ubuntu24.04-xvfb \
-c 'cd /tmp/build && ./testing/test-vscode.sh'
}
test_connectivity:
Expand Down
16 changes: 0 additions & 16 deletions scripts/docker/ubuntu22.04-xvfb.Dockerfile

This file was deleted.

23 changes: 23 additions & 0 deletions scripts/docker/ubuntu24.04-xvfb.Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
FROM ubuntu:24.04

ARG NODE_JS_VERSION
ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update
RUN apt-get -y -qq install git curl apt-transport-https ca-certificates apt-utils software-properties-common

# Install Node.js using nvm (reusing pattern from .evergreen/install-node.sh)
ENV NVM_DIR="/root/.nvm"
RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.38.0/install.sh | bash && \
. "$NVM_DIR/nvm.sh" && \
[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" && \
nvm install --no-progress $NODE_JS_VERSION && \
nvm alias default $NODE_JS_VERSION && \
nvm use $NODE_JS_VERSION

# Set PATH so node/npm are available in all contexts
ENV PATH="$NVM_DIR/versions/node/v$NODE_JS_VERSION/bin:$PATH"

# Install vscode dependencies
RUN apt-get -y -qq install libnss3 gnupg libxkbfile1 libsecret-1-0 libsecret-1-dev libgtk-3-0t64 libxss1 libgbm1 libasound2t64 xvfb build-essential pkg-config

ENTRYPOINT [ "bash" ]
Loading