@uscreen.de/dev-service 0.11.20 → 0.12.0

package/README.md

@@ -1,5 +1,6 @@
 # dev-service
 
+[![Test CI](https://github.com/uscreen/dev-service/actions/workflows/node.js.yml/badge.svg)](https://github.com/uscreen/dev-service/actions/workflows/node.js.yml)
 [![Known Vulnerabilities](https://snyk.io/test/github/uscreen/dev-service/badge.svg?targetFile=package.json)](https://snyk.io/test/github/uscreen/dev-service?targetFile=package.json)
 
 > Manage docker services for local development
@@ -9,7 +10,7 @@
 - a local or remote docker host
 - a docker client connected to that host
 - `docker` and `docker-compose` located in your `$PATH`
-- `node` v12.20 or higher, v14.13 or higher, or v15 or higher
+- `node` v14.13 or higher, or v15 or higher
 
 ## Install
 
@@ -193,6 +194,7 @@ All provided services use their respective default ports:
 | nginx         | 80, 443     |
 | rabbitmq      | 5672, 15672 |
 | elasticsearch | 9200        |
+| mariadb       | 3306        |
 
 ### nginx
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uscreen.de/dev-service",
-  "version": "0.11.20",
+  "version": "0.12.0",
   "description": "cli to manage services in dev repos",
   "main": "index.js",
   "type": "module",
@@ -23,7 +23,7 @@
   "author": "Martin Herting <herting@uscreen.de>",
   "license": "MIT",
   "engines": {
-    "node": "^12.20 || ^14.13 || >=15"
+    "node": "^14.13 || >=15"
   },
   "scripts": {
     "test": "c8 --all tap --no-coverage test/**/*.test.js",
@@ -41,18 +41,18 @@
   ],
   "devDependencies": {
     "@uscreen.de/eslint-config-prettystandard-node": "^0.2.10",
-    "husky": ">=6",
+    "husky": ">=8.0.2",
     "lint-staged": ">=13.0.3",
-    "tap": "^16.3.0"
+    "tap": "^16.3.2"
   },
   "dependencies": {
     "c8": "^7.12.0",
-    "commander": "^9.4.0",
+    "commander": "^9.4.1",
     "fs-extra": "^10.0.1",
     "nanoid": "^4.0.0",
     "parse-json": "^6.0.2",
     "read-pkg": "^7.1.0",
-    "yaml": "^2.1.1"
+    "yaml": "^2.1.3"
   },
   "lint-staged": {
     "*.js": "eslint --cache --fix"

package/src/install.js

@@ -44,7 +44,7 @@ const fillTemplate = (template, data, removeSections, keepSections) => {
 
   for (const r of removeSections) {
     template = template.replace(
-      new RegExp(`{{${r}}}(.|\n)*{{/${r}}}\n?`, 'gm'),
+      new RegExp(`{{${r}}}(.|\n)*?{{/${r}}}\n?`, 'gm'),
       ''
     )
   }

package/src/utils.js

@@ -37,7 +37,7 @@ export const readPackageJson = () => {
  * Escape string for use in docker
  */
 export const escape = (name) =>
-  name.replace(/^[^a-zA-Z0-9]*/, '').replace(/[^a-zA-Z0-9.-]/g, '-')
+  name.replace(/^[^a-zA-Z0-9]*/, '').replace(/[^a-zA-Z0-9-]/g, '-')
 
 /**
  * Checks if compose directory exists and contains files

package/templates/elasticsearch.yml

@@ -6,6 +6,9 @@ services:
     container_name: {{container_name}}
     ports:
       - 9200:9200
+{{mapped-volumes}}
+    user: ${CURRENT_UID}
+{{/mapped-volumes}}
     environment:
       - cluster.name={{projectname}}-elasticsearch-cluster
       - cluster.routing.allocation.disk.threshold_enabled=false

package/templates/mariadb.yml

@@ -0,0 +1,25 @@
+version: '2.4'
+
+services:
+  mariadb:
+    image: {{image}}
+    container_name: {{container_name}}
+    ports:
+      - 3306:3306
+{{mapped-volumes}}
+    user: ${CURRENT_UID}
+{{/mapped-volumes}}
+    environment:
+      - MARIADB_ROOT_PASSWORD=rootpassword
+    volumes:
+{{mapped-volumes}}
+      - ../.volumes/mariadb-data:/var/lib/mysql:delegated
+{{/mapped-volumes}}
+{{named-volumes}}
+      - mariadb-data:/var/lib/mysql:delegated
+
+volumes:
+  mariadb-data:
+    external:
+      name: {{volumesPrefix}}-mariadb-data
+{{/named-volumes}}

package/templates/mongo.yml

@@ -6,6 +6,9 @@ services:
     container_name: {{container_name}}
     ports:
       - 27017:27017
+{{mapped-volumes}}
+    user: ${CURRENT_UID}
+{{/mapped-volumes}}
     volumes:
 {{mapped-volumes}}
       - ../.volumes/mongo-data:/data/db:delegated

package/templates/rabbitmq.yml

@@ -8,6 +8,9 @@ services:
     ports:
       - 5672:5672
       - 15672:15672
+{{mapped-volumes}}
+    user: ${CURRENT_UID}
+{{/mapped-volumes}}
     volumes:
 {{mapped-volumes}}
       - ../.volumes/rabbit-data:/var/lib/rabbitmq/mnesia/rabbit@{{container_name}}-host