Skip to content

Fix the issue that images cause problems with setup scripts #344

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

Open
GuentherJulian wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix the issue that images cause problems with setup scripts #344

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
02a3431
fixed issue that images cause problems with setup scripts
GuentherJulian Mar 7, 2022
6840a0a
removed unnecessary boolean variable
GuentherJulian Mar 8, 2022
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
6 changes: 3 additions & 3 deletions runners/katacoda/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,11 @@ export class Katacoda extends Runner {

let imageDirectory = path.join(this.playbookPath, "images");
if(fs.existsSync(imageDirectory)) {
this.assetManager.registerDirectory(imageDirectory, "", "", true);
this.assetManager.registerDirectory(imageDirectory, "", "", true, false);
}

// copy all assets from temp/setup in assets folder
this.assetManager.registerDirectory(path.join(this.tempPathTutorial, "setup"), "setup", "/root/setup", true);
this.assetManager.registerDirectory(path.join(this.tempPathTutorial, "setup"), "setup", "/root/setup", true, true);
this.assetManager.copyAssets();

// write index file, required for katacoda to load the tutorial
Expand Down Expand Up @@ -478,7 +478,7 @@ export class Katacoda extends Runner {
fs.appendFileSync(setupFile, "##########\n");
}

this.assetManager.registerFile(setupFile, "setup/setup.txt", "/root/setup", false);
this.assetManager.registerFile(setupFile, "setup/setup.txt", "/root/setup", false, true);
}

private changeCurrentDir(targetDir:string, terminalId?: number, isRunning?: boolean):string{
Expand Down
18 changes: 10 additions & 8 deletions runners/katacoda/katacodaAssetManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,27 +11,29 @@ export class KatacodaAssetManager {
this.assetDirectory = assetDir;
}

registerFile(filepathSource: string, filepathTarget: string, katacodaDirectory: string, copyFile: boolean) {
registerFile(filepathSource: string, filepathTarget: string, katacodaDirectory: string, copyFile: boolean, copyIntoKatacodaEnvironment: boolean) {
this.assetData.push({
sourcePath: filepathSource,
targetPath: filepathTarget,
katacodaDirectory: katacodaDirectory,
copyFile: copyFile
});

this.katacodaAssets.push({
file: filepathTarget.replace(/\\/g, "/"),
target: katacodaDirectory.replace(/\\/g, "/")
})
if(copyIntoKatacodaEnvironment) {
Comment thread
GuentherJulian marked this conversation as resolved.
Outdated
this.katacodaAssets.push({
file: filepathTarget.replace(/\\/g, "/"),
target: katacodaDirectory.replace(/\\/g, "/")
})
}
}

registerDirectory(directorySource: string, filepathTarget: string, katacodaDirectory: string, copyFile: boolean) {
registerDirectory(directorySource: string, filepathTarget: string, katacodaDirectory: string, copyFile: boolean, copyIntoKatacodaEnvironment: boolean) {
let dir = fs.readdirSync(directorySource);
dir.forEach(file => {
if(fs.lstatSync(path.join(directorySource, file)).isDirectory()) {
this.registerDirectory(path.join(directorySource, file), filepathTarget, katacodaDirectory, copyFile);
this.registerDirectory(path.join(directorySource, file), filepathTarget, katacodaDirectory, copyFile, copyIntoKatacodaEnvironment);
} else {
this.registerFile(path.join(directorySource, file), path.join(filepathTarget, file), katacodaDirectory, copyFile);
this.registerFile(path.join(directorySource, file), path.join(filepathTarget, file), katacodaDirectory, copyFile, copyIntoKatacodaEnvironment);
}
});
}
Expand Down
2 changes: 1 addition & 1 deletion runners/katacoda/katacodaTools.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export class KatacodaTools {
},
"environment": environment,
"backend": {
"imageid": "ubuntu:1804"
"imageid": "ubuntu:2004"
}
}
return indexJsonObject;
Expand Down