diff --git a/docker-compose.yml b/docker-compose.yml index 38e399f..5be83d3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -41,7 +41,6 @@ services: - TRUSTED_PROXIES=${TRUSTED_PROXIES} - SURVEY_URL=${SURVEY_URL} - BUG_REPORT_URL=${BUG_REPORT_URL} - - HOST_PWD=${PWD} - GOOGLE_CLIENT_ID=${GOOGLE_CLIENT_ID} - GOOGLE_CLIENT_SECRET=${GOOGLE_CLIENT_SECRET} - GITHUB_CLIENT_ID=${GITHUB_CLIENT_ID} @@ -49,6 +48,8 @@ services: - TESTING=true - TESTING_USERNAME=alex - TESTING_PASSWORD=Alex1234 + - HOST_PWD=${PWD} + - MOUNT_QUEST=${MOUNT_QUEST} analytics: build: diff --git a/server/src/config.js b/server/src/config.js index 65008f8..663ab26 100644 --- a/server/src/config.js +++ b/server/src/config.js @@ -25,7 +25,6 @@ const config = { db: get('MONGO_URL', 'mongodb://localhost:27017/odyssey-test'), secret: get('SECRET_KEY', ''), isProduction: process.env.NODE_ENV === 'production', - hostPwd: get('HOST_PWD', ''), containerExpiry: get('EXPIRY', 1000 * 60 * 60), sessionMaxAge: get('SESSION_MAX_AGE', 1000 * 60 * 60 * 24 * 7), google: { @@ -45,6 +44,7 @@ const config = { defaultImage: get('QUEST_IMAGE', 'linuxodyssey/quest-base'), imagePrefix: get('DOCKER_PREFIX', 'linuxodyssey/quest-'), mountQuest: get('MOUNT_QUEST', ''), + hostPwd: get('HOST_PWD', ''), }, } diff --git a/server/src/containers/docker.js b/server/src/containers/docker.js index e71337f..8eee2ce 100644 --- a/server/src/containers/docker.js +++ b/server/src/containers/docker.js @@ -23,10 +23,12 @@ export function createContainer(name, questId) { name, Image: getQuestImage(questId), } - if (!config.isProduction && config.hostPwd && config.mountQuest) { - option.HostConfig.Bind = [ - `${config.hostPwd}/quests/${config.mountQuest}/home:/home/commander`, - `${config.hostPwd}/packages/container:/usr/local/lib/container`, + const { hostPwd, mountQuest } = config.docker + if (!config.isProduction && hostPwd && mountQuest) { + console.log('Mounting quest folder', mountQuest) + option.HostConfig.Binds = [ + `${hostPwd}/quests/${mountQuest}/home:/home/commander`, + `${hostPwd}/packages/container:/usr/local/lib/container`, ] } return engine.createContainer(option)