diff --git a/package.json b/package.json index 943dea4..927e277 100644 --- a/package.json +++ b/package.json @@ -15,8 +15,7 @@ "app": "yarn workspace app dev", "app:local": "yarn workspace app dev:local", "build": "yarn workspaces foreach -Apt run build", - "watch": "yarn workspaces foreach -Rpi --from '{server,app}' run watch", - "build:watch": "concurrently -n server,file-graph,utils,models,constants -c blue,green,yellow,cyan,red \"tsc -w -p server\" \"tsc -w -p packages/file-graph\" \"tsc -w -p packages/utils\" \"tsc -w -p packages/models\" \"tsc -w -p packages/constants\"", + "dev": "yarn workspaces foreach -Rpi --from '{server,app}' run watch", "server": "yarn workspace server dev", "cli": "yarn workspace client start", "lint": "eslint .", diff --git a/server/src/config.js b/server/src/config.js index 5473d57..2f7b7c8 100644 --- a/server/src/config.js +++ b/server/src/config.js @@ -44,7 +44,7 @@ const config = { bugReportUrl: getUrl('BUG_REPORT_URL', ''), docker: { - network: get('DOCKER_NETWORK', 'linux-odyssey-players'), + network: get('DOCKER_NETWORK', 'host'), defaultImage: get('QUEST_IMAGE', 'linuxodyssey/quest-base'), imagePrefix: get('DOCKER_PREFIX', 'linuxodyssey/quest-'), mountQuest: get('MOUNT_QUEST', ''), @@ -57,6 +57,7 @@ const config = { } config.baseUrl = get('BASE_URL', `http://${config.host}:${config.port}`) +config.backendUrl = get('BACKEND_URL', config.baseUrl) config.testing = { enabled: !config.isProduction && process.env.TESTING === 'true', username: get('TESTING_USERNAME', ''), diff --git a/server/src/containers/docker.js b/server/src/containers/docker.js index 12003f6..17fc9ec 100644 --- a/server/src/containers/docker.js +++ b/server/src/containers/docker.js @@ -16,8 +16,6 @@ const containerOptions = { }, } -// const network = engine.getNetwork(config.dockerNetwork) - export function createContainer(name, questId) { const option = { ...containerOptions, @@ -56,7 +54,7 @@ export async function attachContainer(container, { token }) { Tty: true, Env: [ `TOKEN=${token}`, - `API_ENDPOINT=http://backend:3000`, + `API_ENDPOINT=${config.backendUrl}`, 'ZDOTDIR=/etc/zsh', ], }) diff --git a/server/src/utils/quest.js b/server/src/utils/quest.js index dc96f73..31f7d1e 100644 --- a/server/src/utils/quest.js +++ b/server/src/utils/quest.js @@ -41,7 +41,6 @@ async function loadGlobalExceptions() { export async function loadAndUpdateQuests() { await Quest.deleteMany({}) const { exceptions } = await loadGlobalExceptions() - console.log(exceptions) return mapQuests(async (id, questPath) => { const files = await fs.readdir(questPath) if (!files.includes('game.yml')) { @@ -64,7 +63,6 @@ export async function loadAndUpdateQuests() { quest.exceptions.push(...exceptions) await quest.save() } catch (error) { - console.error(error) logger.error(`Error parsing quest`, { id, error }) throw new QuestValidationError(`Error parsing quest`, id, error) }