From 8a836719a27565464b99d31032672526373b457e Mon Sep 17 00:00:00 2001 From: NGPixel Date: Sun, 25 Jun 2017 17:30:33 -0400 Subject: [PATCH] fix: Docker fixes --- Dockerfile | 2 +- npm/configs/config.docker.yml | 154 ------------------ .../{config.heroku.yml => config.passive.yml} | 0 npm/install.js | 6 +- 4 files changed, 3 insertions(+), 159 deletions(-) delete mode 100644 npm/configs/config.docker.yml rename npm/configs/{config.heroku.yml => config.passive.yml} (100%) diff --git a/Dockerfile b/Dockerfile index 244f71e3..f9d50299 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ ENV WIKI_JS_DOCKER 1 WORKDIR /usr/src/app COPY assets assets/ COPY server server/ -COPY npm/configs/config.docker.yml config.yml +COPY npm/configs/config.passive.yml config.yml COPY package.json package.json COPY LICENSE LICENSE RUN npm install --only=production --no-optional diff --git a/npm/configs/config.docker.yml b/npm/configs/config.docker.yml deleted file mode 100644 index fc099d0b..00000000 --- a/npm/configs/config.docker.yml +++ /dev/null @@ -1,154 +0,0 @@ -####################################################################### -# Wiki.js - CONFIGURATION # -####################################################################### -# Full explanation + examples in the documentation: -# https://docs.requarks.io/wiki/install - -# --------------------------------------------------------------------- -# Title of this site -# --------------------------------------------------------------------- - -title: Wiki - -# --------------------------------------------------------------------- -# Full public path to the site, without the trailing slash -# --------------------------------------------------------------------- - -host: http://localhost - -# --------------------------------------------------------------------- -# Port the main server should listen to (80 by default) -# --------------------------------------------------------------------- - -port: $(PORT) - -# --------------------------------------------------------------------- -# Data Directories -# --------------------------------------------------------------------- - -paths: - repo: ./repo - data: ./data - -# --------------------------------------------------------------------- -# Upload Limits -# --------------------------------------------------------------------- -# In megabytes (MB) - -uploads: - maxImageFileSize: 3 - maxOtherFileSize: 100 - -# --------------------------------------------------------------------- -# Site Language -# --------------------------------------------------------------------- -# Possible values: en, es, fr, ko, ru or zh - -lang: en - -# --------------------------------------------------------------------- -# Site Authentication -# --------------------------------------------------------------------- - -public: false - -auth: - defaultReadAccess: false - local: - enabled: true - google: - enabled: true - clientId: GOOGLE_CLIENT_ID - clientSecret: GOOGLE_CLIENT_SECRET - microsoft: - enabled: true - clientId: MS_APP_ID - clientSecret: MS_APP_SECRET - facebook: - enabled: false - clientId: FACEBOOK_APP_ID - clientSecret: FACEBOOK_APP_SECRET - github: - enabled: false - clientId: GITHUB_CLIENT_ID - clientSecret: GITHUB_CLIENT_SECRET - slack: - enabled: false - clientId: SLACK_CLIENT_ID - clientSecret: SLACK_CLIENT_SECRET - ldap: - enabled: false - url: ldap://serverhost:389 - bindDn: cn='root' - bindCredentials: BIND_PASSWORD - searchBase: o=users,o=example.com - searchFilter: (uid={{username}}) - tlsEnabled: false - tlsCertPath: C:\example\root_ca_cert.crt - azure: - enabled: false - clientID: APP_ID - clientSecret: APP_SECRET_KEY - resource: '00000002-0000-0000-c000-000000000000' - tenant: 'YOUR_TENANT.onmicrosoft.com' - -# --------------------------------------------------------------------- -# Secret key to use when encrypting sessions -# --------------------------------------------------------------------- -# Use a long and unique random string (256-bit keys are perfect!) - -sessionSecret: 1234567890abcdefghijklmnopqrstuvxyz - -# --------------------------------------------------------------------- -# Database Connection String -# --------------------------------------------------------------------- - -db: mongodb://wikidb:27017/wiki - -# --------------------------------------------------------------------- -# Git Connection Info -# --------------------------------------------------------------------- - -git: - url: https://github.com/Organization/Repo - branch: master - auth: - - # Type: basic or ssh - type: ssh - - # Only for Basic authentication: - username: marty - password: MartyMcFly88 - - # Only for SSH authentication: - privateKey: /etc/wiki/keys/git.pem - - sslVerify: true - - # Default email to use as commit author - serverEmail: marty@example.com - - # Whether to use user email as author in commits - showUserEmail: true - -# --------------------------------------------------------------------- -# Features -# --------------------------------------------------------------------- -# You can enable / disable specific features below - -features: - linebreaks: true - mathjax: true - -# --------------------------------------------------------------------- -# External Logging -# --------------------------------------------------------------------- - -externalLogging: - bugsnag: false - loggly: false - papertrail: false - rollbar: false - sentry: false - diff --git a/npm/configs/config.heroku.yml b/npm/configs/config.passive.yml similarity index 100% rename from npm/configs/config.heroku.yml rename to npm/configs/config.passive.yml diff --git a/npm/install.js b/npm/install.js index 67ec3384..2c4de41a 100644 --- a/npm/install.js +++ b/npm/install.js @@ -129,10 +129,8 @@ const tasks = { ora.text = 'First-time install, creating a new config.yml...' installMode = 'new' let sourceConfigFile = path.join(installDir, 'config.sample.yml') - if (process.env.WIKI_JS_HEROKU) { - sourceConfigFile = path.join(__dirname, 'configs/config.heroku.yml') - } else if (process.env.WIKI_JS_DOCKER) { - sourceConfigFile = path.join(__dirname, 'configs/config.docker.yml') + if (process.env.WIKI_JS_HEROKU || process.env.WIKI_JS_DOCKER) { + sourceConfigFile = path.join(__dirname, 'configs/config.passive.yml') } return fs.copyAsync(sourceConfigFile, path.join(installDir, 'config.yml')) } else {