@@ -46,7 +46,7 @@ export class DockerContainerRunner implements ContainerRunner {
|
||||
workingDir,
|
||||
envVars = {},
|
||||
pullImage = true,
|
||||
defaultUser = false
|
||||
defaultUser = false,
|
||||
} = options;
|
||||
|
||||
// Show a better error message when Docker is unavailable.
|
||||
@@ -72,7 +72,7 @@ export class DockerContainerRunner implements ContainerRunner {
|
||||
}
|
||||
|
||||
const userOptions: UserOptions = {};
|
||||
if (!defaultUser && (process.getuid && process.getgid)) {
|
||||
if (!defaultUser && process.getuid && process.getgid) {
|
||||
// Files that are created inside the Docker container will be owned by
|
||||
// root on the host system on non Mac systems, because of reasons. Mainly the fact that
|
||||
// volume sharing is done using NFS on Mac and actual mounts in Linux world.
|
||||
|
||||
@@ -114,7 +114,7 @@ export default async function generate(opts: OptionValues) {
|
||||
etag: opts.etag,
|
||||
logStream: getLogStream(logger),
|
||||
siteOptions: { name: opts.siteName },
|
||||
runAsDefaultUser: opts.runAsDefaultUser
|
||||
runAsDefaultUser: opts.runAsDefaultUser,
|
||||
});
|
||||
|
||||
if (configIsTemporary) {
|
||||
|
||||
@@ -78,7 +78,7 @@ export function registerCommands(program: Command) {
|
||||
.option(
|
||||
'--runAsDefaultUser',
|
||||
'Bypass setting the container user as the same user and group id as host for Linux and MacOS',
|
||||
false
|
||||
false,
|
||||
)
|
||||
.alias('build')
|
||||
.action(lazy(() => import('./generate/generate').then(m => m.default)));
|
||||
|
||||
@@ -97,7 +97,7 @@ export class TechdocsGenerator implements GeneratorBase {
|
||||
logger: childLogger,
|
||||
logStream,
|
||||
siteOptions,
|
||||
runAsDefaultUser
|
||||
runAsDefaultUser,
|
||||
} = options;
|
||||
|
||||
// Do some updates to mkdocs.yml before generating docs e.g. adding repo_url
|
||||
@@ -172,7 +172,7 @@ export class TechdocsGenerator implements GeneratorBase {
|
||||
// write to, otherwise they will just fail trying to write to /
|
||||
envVars: { HOME: '/tmp' },
|
||||
pullImage: this.options.pullImage,
|
||||
defaultUser: runAsDefaultUser
|
||||
defaultUser: runAsDefaultUser,
|
||||
});
|
||||
childLogger.info(
|
||||
`Successfully generated docs from ${inputDir} into ${outputDir} using techdocs-container`,
|
||||
|
||||
Reference in New Issue
Block a user