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

fix: Docker resources check on Windows #808

Merged
merged 17 commits into from
Oct 30, 2024
Merged

fix: Docker resources check on Windows #808

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
5531872
feat: add windows CI
Ivo-Yankov Oct 25, 2024
1e99c54
chore: rename CI
Ivo-Yankov Oct 25, 2024
efd2522
fix: change docker info command
Ivo-Yankov Oct 25, 2024
cd764d2
fix: types
Ivo-Yankov Oct 25, 2024
3bca5b6
chore: debugging
Ivo-Yankov Oct 25, 2024
39c443f
chore: debugging
Ivo-Yankov Oct 25, 2024
ad20302
chore: update asserts
Ivo-Yankov Oct 25, 2024
1d4d59c
chore: add CI for smoke tests
Ivo-Yankov Oct 25, 2024
284cf81
chore: start debug session
Ivo-Yankov Oct 25, 2024
4918992
debug: increase retries
Ivo-Yankov Oct 25, 2024
fac567f
debug: use node20
Ivo-Yankov Oct 28, 2024
c72c9a5
debug: revert changes
Ivo-Yankov Oct 28, 2024
40c7b75
debug: apply changes
Ivo-Yankov Oct 28, 2024
2a60b7d
debug: enable tmate session
Ivo-Yankov Oct 28, 2024
bc389f8
debug: try different windows version
Ivo-Yankov Oct 29, 2024
721ca4f
debug: add wsl
Ivo-Yankov Oct 29, 2024
5dcf2d8
chore: remove windows CI
Ivo-Yankov Oct 29, 2024
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
17 changes: 11 additions & 6 deletions src/services/DockerService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,14 +205,19 @@ export class DockerService implements IService{

public async checkDockerResources(isMultiNodeMode: boolean) {
this.logger.info(`${LOADING} Checking docker resources...`, this.serviceName);
const resultDockerInfoCommand = await shell.exec(
"docker system info --format='{{json .}}'",
{ silent: true }

const ncpu = await shell.exec(
"docker info --format='{{.NCPU}}'",
{ silent: true }
);

const memTotal = await shell.exec(
"docker info --format='{{.MemTotal}}'",
{ silent: true }
);

const systemInfoJson = JSON.parse(resultDockerInfoCommand.stdout);
const dockerMemory = Math.round(systemInfoJson['MemTotal'] / Math.pow(1024, 3));
const dockerCPUs = systemInfoJson['NCPU'];
const dockerMemory = Math.round(parseInt(memTotal) / Math.pow(1024, 3));
const dockerCPUs = parseInt(ncpu);

return this.checkMemoryResources(dockerMemory, isMultiNodeMode) &&
this.checkCPUResources(dockerCPUs);
Expand Down
25 changes: 13 additions & 12 deletions test/unit/states/StopState.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,15 @@ import { expect } from 'chai';
import sinon from 'sinon';
import { StopState } from '../../../src/state/StopState';
import {
DOCKER_CLEANING_VALUMES_MESSAGE,
DOCKER_STOPPING_CONTAINERS_MESSAGE,
NETWORK_PREFIX,
STOP_STATE_INIT_MESSAGE,
STOP_STATE_ON_START_MESSAGE,
STOP_STATE_STOPPED_MESSAGE,
STOP_STATE_STOPPING_MESSAGE
} from '../../../src/constants';
DOCKER_CLEANING_VALUMES_MESSAGE,
DOCKER_STOPPING_CONTAINERS_MESSAGE,
IS_WINDOWS,
NETWORK_PREFIX,
STOP_STATE_INIT_MESSAGE,
STOP_STATE_ON_START_MESSAGE,
STOP_STATE_STOPPED_MESSAGE,
STOP_STATE_STOPPING_MESSAGE,
} from "../../../src/constants";
import path from 'path';
import { getTestBed } from '../testBed';
import { LoggerService } from '../../../src/services/LoggerService';
Expand Down Expand Up @@ -102,10 +103,10 @@ describe('StopState tests', () => {
testSandbox.assert.calledThrice(shellCDStub);

// shell commands: 'exec'
testSandbox.assert.calledWith(shellExecStub, 'docker compose kill --remove-orphans 2>/dev/null');
testSandbox.assert.calledWith(shellExecStub, 'docker compose down -v --remove-orphans 2>/dev/null');
testSandbox.assert.calledWith(shellExecStub, 'rm -rf network-logs/* >/dev/null 2>&1');
testSandbox.assert.calledWith(shellExecStub, 'rm -rf "testDir/network-logs" >/dev/null 2>&1');
testSandbox.assert.calledWith(shellExecStub, `docker compose kill --remove-orphans 2>${IS_WINDOWS ? 'null' : '/dev/null'}`);
testSandbox.assert.calledWith(shellExecStub, `docker compose down -v --remove-orphans 2>${IS_WINDOWS ? 'null' : '/dev/null'}`);
testSandbox.assert.calledWith(shellExecStub, `rm -rf network-logs/* >${IS_WINDOWS ? 'null' : '/dev/null'} 2>&1`);
testSandbox.assert.calledWith(shellExecStub, `rm -rf "testDir/network-logs" >${IS_WINDOWS ? 'null' : '/dev/null'} 2>&1`);
testSandbox.assert.calledWith(shellExecStub, `docker network ls --filter name=${NETWORK_PREFIX} --format "{{.ID}}"`);

expect(processTest.processCWDStub.calledOnce).to.be.true;
Expand Down
Loading