Fix network (#174)

.env.prod.sample

@@ -3,6 +3,7 @@ PORT=3000
 BASE_URL=https://example.com
 SECRET_KEY=YOU_SHOULD_CHANGE_THIS
 BACKEND_URL=http://backend:3000
+DOCKER_NETWORK=linux-odyssey-players
 
 MONGO_ROOT_PASSWORD=adminpassword
 MONGO_USER=commander
@@ -29,7 +30,6 @@ ADMIN_PORT=3001
 # GITHUB_CLIENT_SECRET=
 # SURVEY_URL=
 # BUG_REPORT_URL=
-# DOCKER_NETWORK=
 
 # SURVEY_URL=
 # BUG_REPORT_URL=

.env.sample

@@ -3,6 +3,7 @@ PORT=3000
 BASE_URL=http://localhost:5173
 MONGO_URL=mongodb://localhost:27017/odyssey-test
 SECRET_KEY=sample-secret
+DOCKER_NETWORK=linux-odyssey-players-dev
 
 # Optional
 # BACKEND_URL=http://host.docker.internal:3000
@@ -17,7 +18,6 @@ SECRET_KEY=sample-secret
 # GITHUB_CLIENT_SECRET=
 # SURVEY_URL=
 # BUG_REPORT_URL=
-# DOCKER_NETWORK=
 
 # SURVEY_URL=
 # BUG_REPORT_URL=

docker-compose.yml

@@ -13,7 +13,7 @@ services:
   base:
     image: linuxodyssey/quest-base
     networks:
-      - players
+      - players-dev
     build:
       context: .
       dockerfile: ./quests/Dockerfile
@@ -22,7 +22,6 @@ services:
 
 networks:
   internal:
-  players:
+  players-dev:
-    name: linux-odyssey-players
+    name: linux-odyssey-players-dev
     internal: false
-    external: true

server/src/config.ts

@@ -72,7 +72,7 @@ function createConfig() {
     projectRoot,
 
     docker: {
-      network: get('DOCKER_NETWORK', 'linux-odyssey-players'),
+      network: get('DOCKER_NETWORK', 'linux-odyssey-players-dev'),
       defaultImage: get('QUEST_IMAGE', 'linuxodyssey/quest-base'),
       imagePrefix: get('DOCKER_PREFIX', 'linuxodyssey/quest-'),
       mountQuest: process.env.MOUNT_QUEST === 'true',

server/src/containers/docker.ts

@@ -94,20 +94,21 @@ export async function attachContainer(
     config.docker.network
   ].IPAddress
 
+  let error: Error | null = null
   for (let i = 0; i < 10; i++) {
     try {
       // eslint-disable-next-line no-await-in-loop
       const stream = await connectToSSH(containerIp, { token })
       return stream
     } catch (err) {
-      logger.error('Failed to connect to SSH', err)
+      error = err as Error
       // eslint-disable-next-line no-await-in-loop
       await new Promise((resolve) => {
         setTimeout(resolve, 1000)
       })
     }
   }
-  throw new Error('Failed to connect to SSH')
+  throw new Error('Failed to connect to SSH', { cause: error })
 }
 
 export async function deleteContainer(id: string) {