Skip to content

Commit f02d004

Browse files
committed
fix(terminal): fix terminal output
1 parent 07e988c commit f02d004

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

Diff for: src/api/process-manager.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ export function startJob(buildId: number, jobId: number): Promise<void> {
275275
.skip(1)
276276
.subscribe(event => {
277277
terminalEvents.next(event);
278-
if (event.data) {
278+
if (event.data && event.type === 'data') {
279279
process.log.push(event.data);
280280
procs[procIndex] = process;
281281
jobProcesses.next(procs);

Diff for: src/api/process.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ export function startBuildProcess(buildId: number, jobId: number,
5252

5353
function executeInContainer(name: string, command: string, vars = []): Observable<ProcessOutput> {
5454
return new Observable(observer => {
55-
const args = ['exec', '--privileged', '-it']
55+
const args = ['exec', '--privileged']
56+
.concat(command.startsWith('sudo') ? '-i' : '-it')
5657
.concat(vars)
5758
.concat(name, 'bash', '-l', '-c', `'${command}'`);
5859
const process = pty.spawn('docker', [args.join(' ')], { shell: true });
@@ -72,7 +73,7 @@ function executeInContainer(name: string, command: string, vars = []): Observabl
7273

7374
function startContainer(name: string, image: string): Observable<ProcessOutput> {
7475
return new Observable(observer => {
75-
const args = ['run', '--privileged', '-dit', '--name', name, image];
76+
const args = ['run', '--privileged', '-di', '--name', name, image];
7677
const process = pty.spawn('docker', args);
7778

7879
process.on('exit', exitCode => {

0 commit comments

Comments
 (0)