From 13ebe75a85dfe8f3ce4ae9c2b4318b9e28dc0d5b Mon Sep 17 00:00:00 2001 From: William Di Luigi Date: Sat, 14 Sep 2024 12:31:12 +0200 Subject: [PATCH] wip --- .github/workflows/main.yml | 2 +- docker-compose.test.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a7f94ec0c9..6a7dea0129 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,7 +15,7 @@ jobs: - name: Install isolate v2 run: | - cd isolate && DEBIAN_FRONTEND=noninteractive sudo apt-get install -y build-essential libcap-dev libsystemd-dev pkg-config && make isolate && make isolate-cg-keeper && sudo make install && sudo cp systemd/* /etc/systemd/system/ && sudo systemctl daemon-reload && sudo systemctl start isolate.slice && sudo systemctl start isolate.service + cd isolate && sudo apt-get install -y libcap-dev libsystemd-dev && make isolate && make isolate-cg-keeper && sudo make install && sudo cp systemd/* /etc/systemd/system/ && sudo systemctl daemon-reload && sudo systemctl start isolate.slice && sudo systemctl start isolate.service - name: Check if isolate is running run: | diff --git a/docker-compose.test.yml b/docker-compose.test.yml index 36f7dc4592..c0ca207c13 100644 --- a/docker-compose.test.yml +++ b/docker-compose.test.yml @@ -22,9 +22,9 @@ services: cgroup: host command: > wait-for-it testdb:5432 -- sh -c " - mkdir /run/isolate ; - echo /sys/fs/cgroup > /run/isolate/cgroup ; - isolate-check-environment ; + sudo mkdir /run/isolate ; + echo /sys/fs/cgroup | sudo tee /run/isolate/cgroup ; + /home/cmsuser/cms/isolate/isolate-check-environment ; dropdb --host=testdb --username=postgres cmsdbfortesting ; createdb --host=testdb --username=postgres cmsdbfortesting ; cmsInitDB ;