Remove envsubst, Remove config merging (breaking) (#98)

Author: firecow

README.md

@@ -6,7 +6,7 @@ Deploy application to docker swarm in a controlled manner.
 - Rolling update of swarm config, thanks to checksum naming
 - Explicit syntax, no more optionals, no more short syntax
 - [Built-in jinja2 style templating via nunjucks](./examples/swarm-app.yml?plain=1#L13)
-- [Inline swarm configs with envsubst](./examples/swarm-app.yml?plain=1#L34)
+- [Inline swarm configs](./examples/swarm-app.yml?plain=1#L32)
 
 # Usage
 - `swarm-app validate` will exit on basic configuration file mistakes.

eslint.config.ts

@@ -36,10 +36,9 @@ export default defineConfig(
             "@stylistic/object-property-newline": ["error", {allowAllPropertiesOnSameLine: true}],
             "@stylistic/multiline-ternary": ["error", "always-multiline"],
             "@stylistic/newline-per-chained-call": ["error", {ignoreChainWithDepth: 3}],
-            "@typescript-eslint/restrict-template-expressions": ["error", {allow: ["Error"]}],
+            "@typescript-eslint/restrict-template-expressions": ["error", {allow: ["Error"], allowNumber: true}],
 
             "@stylistic/function-call-argument-newline": "off",
-            "@typescript-eslint/no-unnecessary-condition": "off", // TODO: We want this one enabled.
         },
     },
 );

examples/deploy.sh

@@ -7,6 +7,7 @@ docker network inspect external &>/dev/null || docker network create external --
 export STACK_NAME="test"
 export NGINX_FOLDER="/usr/share/nginx/html"
 export NGINX_LOCATION="/public"
+export NGINX_IMAGE_REF=nginx
 
 node ../src/index.js deploy "$STACK_NAME" -f swarm-app.yml -i swarm-app.input.yml
 

examples/diff.sh

@@ -4,6 +4,7 @@ set -e
 
 export STACK_NAME="test"
 export NGINX_FOLDER="/usr/share/nginx/html"
-export NGINX_LOCATION="/public"
+export NGINX_LOCATION="/public-with-diff"
+export NGINX_IMAGE_REF=nginx:alpine
 
-node ../src/index.js diff --write-lhs-rhs -f swarm-app.yml -f swarm-app.diff.yml -i swarm-app.input.yml "$STACK_NAME"
+node ../src/index.js diff "$STACK_NAME" -f swarm-app.yml -i swarm-app.input.yml --write-lhs-rhs

examples/swarm-app.diff.yml

@@ -1,7 +1,7 @@
 ---
 networks:
   default:
-    name: ${STACK_NAME}-hello
+    name: {{ env.STACK_NAME }}-hello
     attachable: true
     external: false
   shared:
@@ -22,7 +22,7 @@ service_specs:
 
   nginx:
     command: ["nginx", "-g", "daemon off;"]
-    image: nginx
+    image: {{ env.NGINX_IMAGE_REF }}
     container_labels:
       org.company.country: england
     configs:
@@ -31,17 +31,15 @@ service_specs:
       /etc/nginx/conf.d/default.conf:
         content: |
           server {
-            location ${NGINX_LOCATION} {
-              root ${NGINX_FOLDER};
+            location {{ env.NGINX_LOCATION }} {
+              root {{ env.NGINX_FOLDER }};
             }
             location /status {
               default_type application/json;
               return 200 '{"status":"success"}';
             }
           }
     env_file: .env
-    environment:
-      NGINX_FOLDER: /usr/share/nginx/html/
     networks:
       - default
       - shared

examples/swarm-app.yml

@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
-
 set -e
 
-node ../src/index.js validate -f swarm-app.yml -f swarm-app.diff.yml -i swarm-app.input.yml
+export NGINX_IMAGE_REF=nginx:alpine
+
+node ../src/index.js validate -f swarm-app.yml -i swarm-app.input.yml