liz/wikijs-fork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: docker detection on install

Browse Source
This commit is contained in:
NGPixel
2017-04-28 20:37:43 -04:00
parent cd600b0541
commit 5d3edcef7b
4 changed files with 165 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
npm/install.js
View File

@@ -136,7 +136,11 @@ const tasks = {
// Is New Install
if (err.code === 'ENOENT') {
ora.text = 'First-time install, creating a new config.yml...'
return fs.copyAsync(path.join(installDir, 'config.sample.yml'), path.join(installDir, 'config.yml')).then(() => {
let sourceConfigFile = 'config.sample.yml'
if (process.env.WIKI_JS_DOCKER) {
sourceConfigFile = 'config.docker.yml'
}
return fs.copyAsync(path.join(installDir, sourceConfigFile), path.join(installDir, 'config.yml')).then(() => {
ora.succeed('Installation succeeded.')
return true
})
@@ -146,7 +150,7 @@ const tasks = {
})
},
startConfigurationWizard () {
if (process.stdout.isTTY) {
if (process.stdout.isTTY && !process.env.WIKI_JS_DOCKER) {
inquirer.prompt([{
type: 'list',
name: 'action',
@@ -205,7 +209,7 @@ const tasks = {
// INSTALL SEQUENCE
// =====================================================
if (!process.env.IS_HEROKU) {
if (!process.env.IS_HEROKU && !process.env.WIKI_JS_DOCKER) {
console.info(colors.yellow(
' __ __ _ _ _ _ \n' +
'/ / /\\ \\ (_) | _(_) (_)___ \n' +