Merge pull request #129 from ownmfa/bconway_tweak_nsq_config

Update NSQ configuration
ownmfa · Nov 15, 2023 · e51bc16 · e51bc16
2 parents 4d71721 + a562fc0
commit e51bc16
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 22 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -27,16 +27,13 @@ jobs:
         credentials:
           username: ownmfa
           password: ${{ secrets.GHCR_PAT }}
-        env:
-          LOG_LEVEL: warn
       nsqd:
         image: ghcr.io/ownmfa/nsqd:v1.2.1
         credentials:
           username: ownmfa
           password: ${{ secrets.GHCR_PAT }}
         env:
           LOOKUP_ADDR: nsqlookupd:4160
-          LOG_LEVEL: warn
       redis:
         image: redis:7-alpine
     steps:

diff --git a/build/deploy/hermes-deps/docker-compose.yml b/build/deploy/hermes-deps/docker-compose.yml
@@ -3,6 +3,7 @@ version: "3"
 services:
   postgres:
     image: postgres:16-alpine
+    shm_size: 128mb
     # command: postgres -c log_statement=all
     ports:
       - "127.0.0.1:5438:5432"
@@ -14,21 +15,19 @@ services:
 
   nsqlookupd:
     image: nsqio/nsq:v1.2.1
-    command: /nsqlookupd --log-level=warn
+    command: /nsqlookupd
 
   nsqd:
     image: nsqio/nsq:v1.2.1
-    command: /nsqd --lookupd-tcp-address=nsqlookupd:4160 --broadcast-address=nsqd --log-level=warn
-    restart: on-failure
+    command: /nsqd --lookupd-tcp-address=nsqlookupd:4160 --broadcast-address=nsqd
     depends_on:
       - nsqlookupd
     volumes:
       - ./volume/nsqd:/data
 
   nsqadmin:
     image: nsqio/nsq:v1.2.1
-    command: /nsqadmin --lookupd-http-address=nsqlookupd:4161 --log-level=warn
-    restart: on-failure
+    command: /nsqadmin --lookupd-http-address=nsqlookupd:4161
     depends_on:
       - nsqlookupd
     ports:

diff --git a/build/deploy/hermes/docker-compose.yml b/build/deploy/hermes/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   hermes-api:
-    image: ghcr.io/ownmfa/hermes:fd458c6f
+    image: ghcr.io/ownmfa/hermes:4d717212
     command: hermes-api
     restart: on-failure
     depends_on:
@@ -35,7 +35,7 @@ services:
       - "traefik.http.services.hermes-grpc.loadbalancer.server.scheme=h2c"
 
   hermes-notifier:
-    image: ghcr.io/ownmfa/hermes:fd458c6f
+    image: ghcr.io/ownmfa/hermes:4d717212
     command: hermes-notifier
     restart: on-failure
     environment:

diff --git a/build/docker-compose.yml b/build/docker-compose.yml
@@ -11,20 +11,18 @@ services:
 
   nsqlookupd:
     image: nsqio/nsq:v1.2.1
-    command: /nsqlookupd --log-level=warn
+    command: /nsqlookupd
     ports:
       - "127.0.0.1:4161:4161"
 
   nsqd_nsqadmin:
     image: nsqio/nsq:v1.2.1
-    # Run nsqd and nsqadmin in the same container to support a broadcast address
-    # outside of Docker
+    # Run nsqd and nsqadmin in the same container to support nsqd-nsqadmin
+    # connectivity and clients outside of Docker without DNS manipulation
     command: >
-      sh -c '/nsqadmin --lookupd-http-address=nsqlookupd:4161 --log-level=warn &
-      /nsqd --lookupd-tcp-address=nsqlookupd:4160 --broadcast-address=127.0.0.1
-      --log-level=warn'
-    restart: on-failure
-    stop_grace_period: 1s
+      sh -c '/nsqd --lookupd-tcp-address=nsqlookupd:4160
+      --broadcast-address=127.0.0.1 &
+      /nsqadmin --lookupd-http-address=nsqlookupd:4161'
     depends_on:
       - nsqlookupd
     ports:

diff --git a/build/nsq/Dockerfile-nsqd b/build/nsq/Dockerfile-nsqd
@@ -1,3 +1,3 @@
 FROM nsqio/nsq:v1.2.1
 
-CMD /nsqd --lookupd-tcp-address=${LOOKUP_ADDR} --log-level=${LOG_LEVEL}
+CMD /nsqd --lookupd-tcp-address=${LOOKUP_ADDR}
diff --git a/build/nsq/Dockerfile-nsqlookupd b/build/nsq/Dockerfile-nsqlookupd
@@ -1,3 +1,3 @@
 FROM nsqio/nsq:v1.2.1
 
-CMD /nsqlookupd --log-level=${LOG_LEVEL}
+CMD /nsqlookupd
diff --git a/build/nsq/README.md b/build/nsq/README.md
@@ -22,7 +22,7 @@ docker logout ghcr.io
 ## Usage
 
 ```
-docker run -it --env LOG_LEVEL=info ghcr.io/ownmfa/nsqlookupd:v1.2.1
+docker run -it ghcr.io/ownmfa/nsqlookupd:v1.2.1
 
-docker run -it --env LOOKUP_ADDR=nsqlookupd:4160 --env LOG_LEVEL=info ghcr.io/ownmfa/nsqd:v1.2.1
+docker run -it --env LOOKUP_ADDR=nsqlookupd:4160 ghcr.io/ownmfa/nsqd:v1.2.1
 ```