Skip to content

Add additionalMounts for GitHub Action Output Mount #219

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

Merged
stuartleeks merged 36 commits into from
Mar 6, 2023
Merged

Add additionalMounts for GitHub Action Output Mount #219

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
5b081c7
WIP(DevContainerCliUpArgs - initial commit to add additional mounts f…
Feb 25, 2023
8bedd62
WIP(DevContainerCliUpArgs) - add back missing lines 188, 195, and 200
Feb 28, 2023
9cee4fc
WIP(DevContainerCliUpArgs - initial commit to add additional mounts f…
Feb 25, 2023
78d12d2
Merge branch 'cliupargs_additionalmounts'
Feb 28, 2023
2907cc1
WIP(DevContainerCliUpArgs) - add back missing env lines in devContain…
Feb 28, 2023
27bbee2
WIP(DevContainerCliUpArgs - initial commit to add additional mounts f…
Feb 25, 2023
b7f72fa
WIP(DevContainerCliUpArgs) - add back missing lines 188, 195, and 200
Feb 28, 2023
40874e3
Merge branch 'main' into cliupargs_additionalmounts
Mar 1, 2023
6a39278
WIP(cliupargs_additionalmounts) - add mounts test to config.ts
Mar 1, 2023
e3812be
WIP(cliupargs_additionalmounts) - add github_outputs test in ci_commo…
Mar 2, 2023
2c34668
WIP(DevContainerCliUpArgs - initial commit to add additional mounts f…
Feb 25, 2023
f9e1b0a
WIP(DevContainerCliUpArgs) - add back missing lines 188, 195, and 200
Feb 28, 2023
c6e766b
Merge branch 'main' into cliupargs_additionalmounts
Mar 2, 2023
9b4dc9a
WIP(cliupargs_additionalmounts) - merge main, fix ci_common weirdness
Mar 2, 2023
4416445
WIP(cliupargs_additionalmounts) - update build-package.sh - I thoguht…
Mar 2, 2023
49d06ec
WIP(cliupargs_additionalmounts) - update build-package.sh - fix quote…
Mar 2, 2023
0316726
WIP(cliupargs_additionalmounts) - update ci_common.yml - add output t…
Mar 2, 2023
af3adbc
WIP(cliupargs_additionalmounts) - update ci_common.yml - update githu…
Mar 2, 2023
601f5fe
WIP(cliupargs_additionalmounts) - update main.ts, change input to mul…
Mar 2, 2023
26e002c
WIP(cliupargs_additionalmounts) - test GITHUB_OUTPUT quotation change
Mar 3, 2023
dd23671
WIP(cliupargs_additionalmounts) - update actions/core
Mar 3, 2023
eb07bde
WIP(cliupargs_additionalmounts) - change mount to mounts, make is str…
Mar 3, 2023
736535a
WIP(cliupargs_additionalmounts) - try adding split for mounts array t…
Mar 3, 2023
508f3c1
WIP(cliupargs_additionalmounts) - revert last change, was running tes…
Mar 3, 2023
59badc8
WIP(cliupargs_additionalmounts) - revert mounts change in config.ts
Mar 3, 2023
32918cc
WIP(cliupargs_additionalmounts) - try setting GITHUB_OUTPUT mount in …
Mar 3, 2023
7c3a510
WIP(cliupargs_additionalmounts) - revert last change and quotation ch…
Mar 3, 2023
735fdf7
WIP(cliupargs_additionalmounts) - remove quotes around GITHUB_OUTPUT …
Mar 3, 2023
1dc49ee
WIP(cliupargs_additionalmounts) - put quotes aroung again as some pe…
Mar 3, 2023
02ce049
run build-local.sh
stuartleeks Mar 3, 2023
812197f
Add env var/mount for GITHUB_OUTPUT
stuartleeks Mar 3, 2023
98260a7
Update github-output test
stuartleeks Mar 3, 2023
24559f1
Add GITHUB_ENV and GITHUB_PATH handling
stuartleeks Mar 3, 2023
1cb4f6c
Update to docker/setup-qemu-action@v2
stuartleeks Mar 4, 2023
0bc1593
Update docker actions
stuartleeks Mar 4, 2023
149a922
More action updates
stuartleeks Mar 4, 2023
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
29 changes: 16 additions & 13 deletions common/src/dev-container-cli.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,15 +114,15 @@ async function runSpecCli<T>(options: {
log: (data: string) => void;
env?: NodeJS.ProcessEnv;
}) {
let stdout = '';
const spawnOptions: SpawnOptions = {
log: data => (stdout += data),
err: data => options.log(data),
env: options.env ? {...process.env, ...options.env} : process.env,
};
const command = getSpecCliInfo().command;
console.log(`About to run ${command} ${options.args.join(' ')}`); // TODO - take an output arg to allow GH to use core.info
await spawn(command, options.args, spawnOptions);
let stdout = '';
const spawnOptions: SpawnOptions = {
log: data => (stdout += data),
err: data => options.log(data),
env: options.env ? {...process.env, ...options.env} : process.env,
};
const command = getSpecCliInfo().command;
console.log(`About to run ${command} ${options.args.join(' ')}`); // TODO - take an output arg to allow GH to use core.info
await spawn(command, options.args, spawnOptions);

return parseCliOutput<T>(stdout);
}
Expand Down Expand Up @@ -151,7 +151,7 @@ async function devContainerBuild(
args.workspaceFolder,
];
if (args.imageName) {
args.imageName.forEach(iName =>
args.imageName.forEach(iName =>
commandArgs.push('--image-name', iName),
);
}
Expand Down Expand Up @@ -185,19 +185,17 @@ export interface DevContainerCliUpArgs {
workspaceFolder: string;
additionalCacheFroms?: string[];
skipContainerUserIdUpdate?: boolean;
env?: string[];
userDataFolder?: string;
additionalMounts?: string[];
}
async function devContainerUp(
args: DevContainerCliUpArgs,
log: (data: string) => void,
): Promise<DevContainerCliUpResult | DevContainerCliError> {
const remoteEnvArgs = getRemoteEnvArray(args.env);
Comment thread
andar1an marked this conversation as resolved.
const commandArgs: string[] = [
'up',
'--workspace-folder',
args.workspaceFolder,
...remoteEnvArgs,
];
if (args.additionalCacheFroms) {
args.additionalCacheFroms.forEach(cacheFrom =>
Expand All @@ -210,6 +208,11 @@ async function devContainerUp(
if (args.skipContainerUserIdUpdate) {
commandArgs.push('--update-remote-user-uid-default', 'off');
}
if (args.additionalMounts) {
args.additionalMounts.forEach(mount =>
commandArgs.push('--mount', mount),
);
}
return await runSpecCli<DevContainerCliUpResult>({
args: commandArgs,
log,
Expand Down
2 changes: 2 additions & 0 deletions github-action/src/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ export async function runMain(): Promise<void> {
'skipContainerUserIdUpdate',
);
const userDataFolder: string = core.getInput('userDataFolder');
const mount: string[] = core.getInput('mount');

if (platform) {
const skopeoInstalled = await isSkopeoInstalled();
Expand Down Expand Up @@ -127,6 +128,7 @@ export async function runMain(): Promise<void> {
skipContainerUserIdUpdate,
env: inputEnvsWithDefaults,
userDataFolder,
additionalMounts: mount,
};
const result = await devcontainer.up(args, log);
if (result.outcome !== 'success') {
Expand Down