diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8e8c01dd..d69de51f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,8 +27,6 @@ jobs: credentials: username: ownmfa password: ${{ secrets.GHCR_PAT }} - env: - LOG_LEVEL: warn nsqd: image: ghcr.io/ownmfa/nsqd:v1.2.1 credentials: @@ -36,7 +34,6 @@ jobs: 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 index 30d74390..f9ef43ba 100644 --- 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,12 +15,11 @@ 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: @@ -27,8 +27,7 @@ services: 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 index 31cec050..b3dfc12a 100644 --- 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 index 36048b1b..b37d1acc 100644 --- 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 index 7ba0566d..c9f9a33a 100644 --- 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 index f54c5104..d045b229 100644 --- 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 \ No newline at end of file diff --git a/build/nsq/README.md b/build/nsq/README.md index 21a17cbe..9263cb6e 100644 --- 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 ```