test(tools): support cgroup v2 only systems

adaltas · Sep 9, 2023 · df88b74 · df88b74
1 parent 72c4286
commit df88b74
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 10 deletions.
diff --git a/packages/tools/env/cron/Dockerfile b/packages/tools/env/cron/Dockerfile
@@ -1,4 +1,4 @@
-FROM centos:7
+FROM almalinux:8
 MAINTAINER David Worms
 
 # Install Node.js

diff --git a/packages/tools/env/dconf/Dockerfile b/packages/tools/env/dconf/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:trusty
+FROM ubuntu:22.04
 MAINTAINER David Worms
 
 LABEL project=nikita \
@@ -14,11 +14,14 @@ RUN \
 
 # Install SSH
 RUN apt-get install -y openssh-server \
-  && ssh-keygen -t rsa -f ~/.ssh/id_rsa -N '' \
-  && cat ~/.ssh/id_rsa.pub > ~/.ssh/authorized_keys \
+  && ssh-keygen -t ed25519 -f ~/.ssh/id_ed25519 -N '' \
+  && cat ~/.ssh/id_ed25519.pub > ~/.ssh/authorized_keys \
   && ssh-keygen -A \
   && mkdir -p /run/sshd
 
+# Install dbus-x11 required by dbus-launch in entrypoint.sh
+RUN apt install -y dbus-x11
+
 # Install local dependencies
 RUN apt-get install -y dconf-cli gnome-terminal
 COPY dbus.conf /etc/dbus-1/session.d/dbus.conf

diff --git a/packages/tools/env/dconf/test.coffee b/packages/tools/env/dconf/test.coffee
@@ -10,5 +10,5 @@ module.exports =
     env: DBUS_SESSION_BUS_ADDRESS:'unix:path=/tmp/dbus.sock'
     ssh:
       host: '127.0.0.1', username: process.env.USER,
-      private_key_path: '~/.ssh/id_rsa'
+      private_key_path: '~/.ssh/id_ed25519'
   ]
diff --git a/packages/tools/env/npm/index.coffee b/packages/tools/env/npm/index.coffee
@@ -29,7 +29,7 @@ runner
         if command -v node ; then exit 42; fi
         curl -sS -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.37.2/install.sh | bash
         . ~/.bashrc
-        nvm install 16
+        nvm install 20
         '''
         trap: true
         code: [0, 42]

diff --git a/packages/tools/env/repo-centos7/Dockerfile b/packages/tools/env/repo-centos7/Dockerfile
@@ -1,4 +1,4 @@
-FROM centos:7.9.2009
+FROM almalinux:8
 MAINTAINER David Worms
 
 RUN \
@@ -26,10 +26,10 @@ RUN useradd nikita -d /home/nikita && \
 USER nikita
 
 # Install Node.js
-# Note, CentOS 7.9.2009 incompatible with Node.js >= 18
+ENV NODE_VERSION stable
 RUN \
-  curl -L https://git.io/n-install | bash -s -- -y 16.19
-ENV PATH /home/nikita/n/bin:$PATH
+  curl -L https://git.io/n-install | bash -s -- -y && \
+  . ~/.bashrc && n $NODE_VERSION
 
 RUN \
  ssh-keygen -t ed25519 -f ~/.ssh/id_ed25519 -N '' && \