refactor(docker): ports as explicit config

packages/db/src/containers.js

@@ -11,16 +11,17 @@ export default () => {
   let args = [];
   let image;
   let mount;
+  let ports = {};
   switch (dialect) {
     case 'mysql': {
       args = [
         '-e', `MYSQL_USER=${username}`,
         '-e', `MYSQL_DATABASE=${database}`,
         '-e', `MYSQL_ROOT_PASSWORD=${password}`,
-        '-p', `${port}:3306`,
       ];
       image = 'mysql';
       mount = '/var/lib/mysql';
+      ports = {[port]: 3306};
       break;
     }
     case 'postgres': {
@@ -28,10 +29,10 @@ export default () => {
         '-e', `POSTGRES_USER=${username}`,
         '-e', `POSTGRES_DB=${database}`,
         '-e', `POSTGRES_PASSWORD=${password}`,
-        '-p', `${port}:5432`,
       ];
       image = 'postgres';
       mount = '/var/lib/postgresql/data';
+      ports = {[port]: 5432};
       break;
     }
     default:
@@ -44,6 +45,7 @@ export default () => {
       args,
       image,
       mount,
+      ports,
     },
   };
 };

packages/docker/src/start-container.js

@@ -43,6 +43,8 @@ export default async (flecks, key, config) => {
     '--name', name,
     '--rm',
     ...(config.args || []),
+    ...Object.entries(config.ports)
+      .map(([host, container]) => ['-p', `${host}:${container}`]).flat(),
   ];
   const datadir = join(tmpdir(), 'flecks', key, 'docker');
   debug("creating datadir '%s'", datadir);

packages/redis/src/containers.js

@@ -4,10 +4,8 @@ const {
 
 export default () => ({
   redis: {
-    args: [
-      '-p', `${REDIS_PORT}:6379`,
-    ],
     image: 'redis',
     mount: '/data',
+    ports: {[REDIS_PORT]: 6379},
   },
 });