@uscreen.de/dev-service 0.12.5 → 0.12.6

package/README.md

@@ -271,8 +271,7 @@ services:
       - thread_pool.bulk.queue_size=200
 volumes:
   elasticsearch-data:
-    external:
-      name: "foobar-dev-repo-elasticsearch-data"
+    name: "foobar-dev-repo-elasticsearch-data"
 ```
 
 This action has the following features & caveats:
@@ -331,6 +330,14 @@ And the folder structure would look like this:
 
 > Format according to https://keepachangelog.com
 
+### v0.12.6
+#### Fixed
+- work with current docker compose
+
+### v0.12.0
+#### Added
+- mariadb template
+
 ### v0.11.17
 #### Fixed
 - custom services with container ports lower than 60 now work as expected

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uscreen.de/dev-service",
-  "version": "0.12.5",
+  "version": "0.12.6",
   "description": "cli to manage services in dev repos",
   "main": "index.js",
   "type": "module",

package/src/check.js

@@ -110,13 +110,10 @@ const getOwnPorts = () =>
     ps.push('ps', '-q')
 
     exec(`docker-compose ${ps.join(' ')}`, function (err, stdout, stderr) {
-      if (err) {
-        return reject(err)
-      }
+      if (err) return reject(err)
 
-      if (stderr.toString().trim()) {
-        return reject(stderr.toString().trim())
-      }
+      const errMessage = stderr.toString().trim()
+      if (errMessage) return reject(Error(errMessage))
 
       const ids = stdout.split('\n').filter((id) => id)
 
@@ -133,9 +130,10 @@ const getOwnPorts = () =>
 const getContainerPorts = (containerId) =>
   new Promise((resolve, reject) => {
     exec(`docker port ${containerId}`, function (err, stdout, stderr) {
-      if (err || stderr.toString().trim()) {
-        return reject(err)
-      }
+      if (err) return reject(err)
+
+      const errMessage = stderr.toString().trim()
+      if (errMessage) return reject(Error(errMessage))
 
       const lines = stdout.split('\n').filter((l) => l)
       const ports = lines
@@ -210,9 +208,10 @@ const getProcess = async (pid) =>
     exec(
       `ps -p ${pid} -ww -o pid,ppid,uid,gid,args`,
       function (err, stdout, stderr) {
-        if (err || stderr.toString().trim()) {
-          return reject(err)
-        }
+        if (err) return reject(err)
+
+        const errMessage = stderr.toString().trim()
+        if (errMessage) return reject(Error(errMessage))
 
         const processes = stdout
           .toString()

package/src/install.js

@@ -1,6 +1,7 @@
 'use strict'
 
 import path from 'path'
+import os from 'os'
 import fs from 'fs-extra'
 import YAML from 'yaml'
 import parseJson from 'parse-json'
@@ -52,6 +53,8 @@ const fillTemplate = (template, data, removeSections, keepSections) => {
     template = template.replace(new RegExp(`{{/?${k}}}\n?`, 'gm'), '')
   }
 
+  template = template.replace('{{current_uid}}', os.userInfo().uid)
+
   return template
 }
 
@@ -79,9 +82,9 @@ const ensureNamedVolumes = async (content) => {
 
   const volumes = []
   for (const key in data.volumes) {
-    if (!data.volumes[key].external) continue
+    if (!data.volumes[key]) continue
 
-    const name = data.volumes[key].external.name
+    const name = data.volumes[key].name
     if (!name) continue
 
     volumes.push(name)
@@ -141,9 +144,7 @@ const readCustomServiceData = (service) => {
 
       // volume is named => we add it to top level "volumes" directive:
       volumes[volumeName] = {
-        external: {
-          name: `{{projectname}}-${volumeName}`
-        }
+        name: `{{projectname}}-${volumeName}`
       }
     }
   }

package/src/utils.js

@@ -61,7 +61,7 @@ const getComposePath = (containerId) =>
       if (err) reject(err)
 
       const errMessage = stderr.toString().trim()
-      if (errMessage) reject(new Error(errMessage))
+      if (errMessage) reject(Error(errMessage))
 
       const [data] = JSON.parse(stdout)
 
@@ -81,9 +81,10 @@ const getComposePath = (containerId) =>
 export const getComposePaths = () =>
   new Promise((resolve, reject) => {
     exec('docker ps -q', function (err, stdout, stderr) {
-      if (err || stderr.toString().trim()) {
-        return reject(err)
-      }
+      if (err) reject(err)
+
+      const errMessage = stderr.toString().trim()
+      if (errMessage) reject(Error(errMessage))
 
       const containers = stdout.split(/\n/).filter((r) => r)
 

package/templates/elasticsearch.yml

@@ -7,7 +7,7 @@ services:
     ports:
       - 9200:9200
 {{mapped-volumes}}
-    user: ${CURRENT_UID}
+    user: '{{current_uid}}'
 {{/mapped-volumes}}
     environment:
       - cluster.name={{projectname}}-elasticsearch-cluster
@@ -22,6 +22,5 @@ services:
 
 volumes:
   elasticsearch-data:
-    external:
-      name: {{volumesPrefix}}-elasticsearch-data
+    name: {{volumesPrefix}}-elasticsearch-data
 {{/named-volumes}}

package/templates/mariadb.yml

@@ -7,7 +7,7 @@ services:
     ports:
       - 3306:3306
 {{mapped-volumes}}
-    user: ${CURRENT_UID}
+    user: '{{current_uid}}'
 {{/mapped-volumes}}
     environment:
       - MARIADB_ROOT_PASSWORD=rootpassword
@@ -20,6 +20,5 @@ services:
 
 volumes:
   mariadb-data:
-    external:
-      name: {{volumesPrefix}}-mariadb-data
+    name: {{volumesPrefix}}-mariadb-data
 {{/named-volumes}}

package/templates/mongo.yml

@@ -7,7 +7,7 @@ services:
     ports:
       - 27017:27017
 {{mapped-volumes}}
-    user: ${CURRENT_UID}
+    user: '{{current_uid}}'
 {{/mapped-volumes}}
     volumes:
 {{mapped-volumes}}
@@ -18,6 +18,5 @@ services:
 
 volumes:
   mongo-data:
-    external:
-      name: {{volumesPrefix}}-mongo-data
+    name: {{volumesPrefix}}-mongo-data
 {{/named-volumes}}

package/templates/rabbitmq.yml

@@ -9,7 +9,7 @@ services:
       - 5672:5672
       - 15672:15672
 {{mapped-volumes}}
-    user: ${CURRENT_UID}
+    user: '{{current_uid}}'
 {{/mapped-volumes}}
     volumes:
 {{mapped-volumes}}
@@ -20,6 +20,5 @@ services:
 
 volumes:
   rabbit-data:
-    external:
-      name: {{volumesPrefix}}-rabbit-data
+    name: {{volumesPrefix}}-rabbit-data
 {{/named-volumes}}