Fix tty:true containers. Add GHA push workflow.

.github/workflows/push.yml

@@ -0,0 +1,33 @@
+name: Push
+
+on:
+  push: {}
+  pull_request:
+    branches: [ main ]
+  workflow_dispatch: {}
+
+jobs:
+  compose-tests:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: npm install
+        run: npm install
+
+      - name: Startup compose example
+        timeout-minutes: 2
+        run: time docker compose -p dcmon-test -f examples/docker-compose.yaml up -d
+
+      - name: dcmon
+        timeout-minutes: 5
+        run: |
+          time ./dcmon --no-tui --show-events all dcmon-test ./examples/checks.yaml
+
+      - name: dcmon final state
+        if: always()
+        timeout-minutes: 1
+        run: |
+          export FORCE_COLOR=1
+          ./dcmon --static-once dcmon-test ./examples/checks.yaml

README.md

@@ -8,7 +8,7 @@ Monitor docker-compose services.
 
 ```
 npm install
-./node_modules/.bin/nbb -cp src/ -m dcmon.core PROJECT ./checks.yaml
+./dcmon PROJECT ./checks.yaml
 ```
 
 * Compile and run with shadow-cljs:
@@ -38,7 +38,7 @@ In one terminal, launch dcmon as described above using a PROJECT value
 of `${USER}-test`. For example, to use nbb directly:
 
 ```
-./node_modules/.bin/nbb -cp src/ -m dcmon.core ${USER}-test ./examples/checks.yaml
+./dcmon ${USER}-test ./examples/checks.yaml
 ```
 
 

examples/checks.yaml

@@ -26,9 +26,14 @@ checks:
     - {id: "Line 10",  regex: "Line 10\\b"}
     - {id: "Line 15",  regex: "Line 15\\b"}
     - {id: "Line 20",  regex: "Line 20\\b"}
-    - {id: "ping",     cmd: "ping -c 1 8.8.8.8",
+    - {id: "ping",     cmd: "ping -c 1 final",
                        deps: {counter: "Line 20"}}
 
+  with_tty:
+    - {id: "Started",  regex: "Started"}
+    - {id: "Line 10",  regex: "Line 10\\b"}
+    - {id: "Line 20",  regex: "Line 20\\b"}
+
   delay30:
     - {id: "Started",  regex: "Started"}
     - {noop: true}
@@ -46,8 +51,9 @@ checks:
     - {noop: true}
     - {noop: true}
     - {noop: true}
-    - {id: "ping",     cmd: "ping -c 1 8.8.8.8",
+    - {id: "ping",     cmd: "ping -c 1 counter",
                        deps: {scale:   "Started",
                               counter: "ping",
+                              with_tty: "Line 20",
                               delay30: "Done",
                               final:   "Started"}}

examples/docker-compose.yaml

@@ -27,6 +27,11 @@ services:
     image: alpine
     command: sh -c 'echo "Started"; i=0; while true; do echo "Line $$i"; sleep 1; i=$$(( i + 1 )); done'
 
+  with_tty:
+    image: alpine
+    tty: true
+    command: sh -c 'echo "Started"; i=0; while true; do echo "Line $$i"; sleep 1; i=$$(( i + 1 )); done'
+
   delay30:
     image: alpine
     command: sh -c 'echo "Started"; for i in $$(seq 30); do echo "i - $$i"; sleep 1; done; echo "Done"; sleep 99999'

package.json

@@ -1,6 +1,6 @@
 {
   "name": "dcmon",
-  "version": "1.4",
+  "version": "1.5",
   "description": "docker-compose monitor",
   "dependencies": {
     "dockerode": "^3.3.1",

src/dcmon/core.cljc

@@ -435,7 +435,7 @@ Options:
 (defn init-container
   "[Async] Configure log monitoring for a newly detected or newly
   running container. Resolves to the updated state of ctx."
-  [service cidx container status log-handler]
+  [service cidx container status tty log-handler]
   (let [{:keys [services]} @ctx
         old-stream (get-in services [service cidx :log-stream])
         log-stream (doto (stream/PassThrough.)
@@ -452,8 +452,10 @@ Options:
                                          :stdout true
                                          :stderr true
                                          :timestamps true})]
-      (-> (.-modem container)
-          (.demuxStream stream log-stream log-stream))
+      (if tty
+        (.pipe stream log-stream)
+        (-> (.-modem container)
+            (.demuxStream stream log-stream log-stream)))
       (.on stream "end" #(.end log-stream "!stop!"))
       (swap! ctx assoc-in [:services service cidx :log-stream] stream))))
 
@@ -469,14 +471,15 @@ Options:
             inspect-raw (.inspect container)
             inspect (->clj inspect-raw)
             status (-> inspect :State :Status)
+            tty (-> inspect :Config :Tty)
             service (keyword (-> inspect :Config :Labels :com.docker.compose.service))
             cidx (js/parseInt (-> inspect :Config :Labels :com.docker.compose.container-number))
             {:keys [services]} (ensure-service service cidx)]
       (swap! ctx #(-> %
                       (assoc-in [:containers id] inspect)
                       (assoc-in [:services service cidx :id] id)))
       (if init?
-        (init-container service cidx container status
+        (init-container service cidx container status tty
                         (partial docker-log-handler service cidx))
         (event :container-update {:service service :cidx cidx :id id
                                   :status status})))