wip: allow connection from docker container

docker-compose.yml

@@ -12,12 +12,16 @@ services:
 
   base:
     image: linuxodyssey/quest-base
+    # networks:
+    #   - players
     build:
       context: .
       dockerfile: ./quests/Dockerfile
+    extra_hosts:
+      - 'host.docker.internal:host-gateway'
 
 networks:
   internal:
   players:
     name: linux-odyssey-players
-    internal: true
+    internal: false

quests/Dockerfile

@@ -30,6 +30,8 @@ RUN chmod 600 /home/${USERNAME}/.ssh/authorized_keys \
   && chmod 700 /home/${USERNAME}/.ssh \
   && chown -R ${USERNAME}:${USERNAME} /home/${USERNAME}/.ssh
 
+RUN apt-get install -y net-tools
+
 RUN service ssh start
 
 EXPOSE 22

server/src/api/socket.ts

@@ -77,7 +77,8 @@ async function connectContainer(socket: Socket, next: (err?: Error) => void) {
       stream,
     }
     next()
-  } catch {
+  } catch (err) {
+    console.error(err)
     next(new Error('Failed to start container.'))
   }
 }

server/src/config.ts

@@ -31,7 +31,7 @@ function getUrl(key: string): string {
 
 function createConfig() {
   const isProduction = process.env.NODE_ENV === 'production'
-  const host = get('HOST', 'localhost')
+  const host = get('HOST', '0.0.0.0')
   const port = Number(get('PORT', 3000))
   const baseUrl = get('BASE_URL', `http://${host}:${port}`)
   const url = new URL(baseUrl)

server/src/containers/docker.ts

@@ -4,45 +4,52 @@ import logger from '../utils/logger.js'
 
 const engine = new Docker()
 
-const containerOptions = {
+const newContainerOptions = (
+  name: string,
+  imageId: string,
+  options: {
+    binds?: string[]
+  } = {}
+): Docker.ContainerCreateOptions => ({
   // AttachStdin: true,
   // AttachStdout: true,
   // AttachStderr: true,
   // Tty: true,
   // OpenStdin: true,
   // StdinOnce: false,
+  name,
+  Image: getQuestImage(imageId),
   HostConfig: {
-    NetworkMode: config.docker.network,
+    NetworkMode: 'linux-odyssey-players', // config.docker.network,
-    PortBindings: {
+    // PortBindings: {
-      '22/tcp': [
+    //   '22/tcp': [
-        {
+    //     {
-          HostPort: '11122', // random port
+    //       HostIP: '0.0.0.0',
-        },
+    //       HostPort: '11122', // random port
-      ],
+    //     },
-    },
+    //   ],
+    // },
+    Binds: options.binds,
+    ExtraHosts: ['host.docker.internal:host-gateway'],
   },
   ExposedPorts: {
-    '22/tcp': {},
+    // '22/tcp': {},
   },
-} as Docker.ContainerCreateOptions
+})
 
 export function createContainer(
   name: string,
   imageId: string
 ): Promise<Docker.Container> {
-  const option = {
+  let binds: string[] = []
-    ...containerOptions,
-    name,
-    Image: getQuestImage(imageId),
-  }
-
   if (!config.isProduction && config.docker.mountQuest && imageId !== 'base') {
     logger.info('Mounting quest folder', imageId)
-    option.HostConfig!.Binds = [
+    binds = [
       `${config.projectRoot}/quests/${imageId}/home:/home/commander`,
       `${config.projectRoot}/packages/container:/usr/local/lib/container`,
     ]
   }
+  const option = newContainerOptions(name, imageId, { binds })
   return engine.createContainer(option)
 }
 

server/src/index.ts

@@ -72,7 +72,7 @@ async function main() {
   app.use('/api/v1', apiRouter)
   app.use(errorHandler)
 
-  server.listen(config.port, config.host, () => {
+  server.listen(config.port, '0.0.0.0', () => {
     logger.info(`Server listening at ${config.baseUrl}`)
   })
 }