Skip to content

Commit

Permalink
Merge pull request #139 from ownmfa/bconway_update_nsq
Browse files Browse the repository at this point in the history
Update NSQ to v1.3.0
  • Loading branch information
bconway authored Dec 28, 2023
2 parents 535e196 + 8b1e502 commit 2298e54
Show file tree
Hide file tree
Showing 49 changed files with 3,068 additions and 1,075 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ jobs:
POSTGRES_PASSWORD: postgres
POSTGRES_DB: hermes_test
nsqlookupd:
image: ghcr.io/ownmfa/nsqlookupd:v1.2.1
image: ghcr.io/ownmfa/nsqlookupd:v1.3.0
credentials:
username: ownmfa
password: ${{ secrets.GHCR_PAT }}
nsqd:
image: ghcr.io/ownmfa/nsqd:v1.2.1
image: ghcr.io/ownmfa/nsqd:v1.3.0
credentials:
username: ownmfa
password: ${{ secrets.GHCR_PAT }}
Expand Down
6 changes: 3 additions & 3 deletions build/deploy/hermes-deps/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,19 @@ services:
- ./volume/postgres:/var/lib/postgresql/data

nsqlookupd:
image: nsqio/nsq:v1.2.1
image: nsqio/nsq:v1.3.0
command: /nsqlookupd

nsqd:
image: nsqio/nsq:v1.2.1
image: nsqio/nsq:v1.3.0
command: /nsqd --lookupd-tcp-address=nsqlookupd:4160 --broadcast-address=nsqd
depends_on:
- nsqlookupd
volumes:
- ./volume/nsqd:/data

nsqadmin:
image: nsqio/nsq:v1.2.1
image: nsqio/nsq:v1.3.0
command: /nsqadmin --lookupd-http-address=nsqlookupd:4161
depends_on:
- nsqlookupd
Expand Down
4 changes: 2 additions & 2 deletions build/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ services:
- POSTGRES_DB=hermes_test

nsqlookupd:
image: nsqio/nsq:v1.2.1
image: nsqio/nsq:v1.3.0
command: /nsqlookupd
ports:
- "127.0.0.1:4161:4161"

nsqd_nsqadmin:
image: nsqio/nsq:v1.2.1
image: nsqio/nsq:v1.3.0
# Run nsqd and nsqadmin in the same container to support nsqd-nsqadmin
# connectivity and clients outside of Docker without DNS manipulation
command: >
Expand Down
2 changes: 1 addition & 1 deletion build/nsq/Dockerfile-nsqd
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
FROM nsqio/nsq:v1.2.1
FROM nsqio/nsq:v1.3.0

CMD /nsqd --lookupd-tcp-address=${LOOKUP_ADDR}
2 changes: 1 addition & 1 deletion build/nsq/Dockerfile-nsqlookupd
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
FROM nsqio/nsq:v1.2.1
FROM nsqio/nsq:v1.3.0

CMD /nsqlookupd
8 changes: 4 additions & 4 deletions build/nsq/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ production NSQ images and set specific `CMD` values for each service.
docker login -u ownmfa -p XXX ghcr.io
docker buildx create --use
docker buildx build -f Dockerfile-nsqlookupd -t ghcr.io/ownmfa/nsqlookupd:v1.2.1 --platform linux/amd64,linux/arm64 --push .
docker buildx build -f Dockerfile-nsqlookupd -t ghcr.io/ownmfa/nsqlookupd:v1.3.0 --platform linux/amd64,linux/arm64 --push .
docker buildx build -f Dockerfile-nsqd -t ghcr.io/ownmfa/nsqd:v1.2.1 --platform linux/amd64,linux/arm64 --push .
docker buildx build -f Dockerfile-nsqd -t ghcr.io/ownmfa/nsqd:v1.3.0 --platform linux/amd64,linux/arm64 --push .
docker buildx rm
docker logout ghcr.io
Expand All @@ -22,7 +22,7 @@ docker logout ghcr.io
## Usage

```
docker run -it ghcr.io/ownmfa/nsqlookupd:v1.2.1
docker run -it ghcr.io/ownmfa/nsqlookupd:v1.3.0
docker run -it --env LOOKUP_ADDR=nsqlookupd:4160 ghcr.io/ownmfa/nsqd:v1.2.1
docker run -it --env LOOKUP_ADDR=nsqlookupd:4160 ghcr.io/ownmfa/nsqd:v1.3.0
```
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ require (
go.uber.org/mock v0.4.0
golang.org/x/crypto v0.17.0
google.golang.org/grpc v1.60.1
google.golang.org/protobuf v1.31.0
google.golang.org/protobuf v1.32.0
)

require (
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1105,8 +1105,8 @@ google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQ
google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I=
google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
Expand Down
38 changes: 29 additions & 9 deletions vendor/google.golang.org/protobuf/encoding/protojson/decode.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

39 changes: 34 additions & 5 deletions vendor/google.golang.org/protobuf/encoding/protojson/encode.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 2298e54

Please sign in to comment.