diff --git a/README.md b/README.md index 3107ae3..cb54c52 100644 --- a/README.md +++ b/README.md @@ -11,4 +11,4 @@ A NSQ image for running on a kubernetes cluster. ## Description NSQ is a high performance realtime distributed messaging platform. This image is for running `nsqd` on a kubernetes cluster. It provides no data persistence or the `nsqlookupd` service. Access to the queue is provided through a service ip. -[v2.18]: https://github.com/deisthree/workflow/releases/tag/v2.18.0 +[v2.18]: https://github.com/teamhephy/workflow/releases/tag/v2.18.0 diff --git a/charts/nsqd/Chart.yaml b/charts/nsqd/Chart.yaml index 6d9e85a..36b77e1 100644 --- a/charts/nsqd/Chart.yaml +++ b/charts/nsqd/Chart.yaml @@ -1,7 +1,7 @@ name: nsqd -home: https://github.com/deisthree/nsq +home: https://github.com/teamhephy/nsq version: description: A kubernetes based docker image for running nsq daemon. maintainers: - - name: Deis Team - email: engineering@deis.com + - name: Team Hephy + email: team@teamhephy.com diff --git a/rootfs/Dockerfile b/rootfs/Dockerfile index fe206f2..b38f1dd 100644 --- a/rootfs/Dockerfile +++ b/rootfs/Dockerfile @@ -8,11 +8,12 @@ RUN adduser --system \ nsq \ && curl -Ls https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 > /usr/bin/jq \ && chmod +x /usr/bin/jq \ - && curl -s https://s3.amazonaws.com/bitly-downloads/nsq/nsq-0.3.8.linux-amd64.go1.6.2.tar.gz | tar xz \ - && mv /nsq-0.3.8.linux-amd64.go1.6.2/bin/* /bin \ - && rm -r /nsq-0.3.8.linux-amd64.go1.6.2 \ + && curl -sL https://github.com/nsqio/nsq/releases/download/v1.0.0-compat/nsq-1.0.0-compat.linux-amd64.go1.8.tar.gz | tar xz \ + && mv /nsq-1.0.0-compat.linux-amd64.go1.8/bin/* /bin \ + && rm -r /nsq-1.0.0-compat.linux-amd64.go1.8 \ && mkdir /opt/nsq/data COPY . / RUN chown -R nsq:nsq /opt/nsq USER nsq +WORKDIR /opt/nsq/data diff --git a/rootfs/opt/nsq/bin/start-nsqd b/rootfs/opt/nsq/bin/start-nsqd index d8caf6f..2c9573f 100755 --- a/rootfs/opt/nsq/bin/start-nsqd +++ b/rootfs/opt/nsq/bin/start-nsqd @@ -3,4 +3,5 @@ set -eo pipefail export MAX_READY_COUNT=${MAX_READY_COUNT:-10000} export DATA_PATH=${DATA_PATH:-/opt/nsq/data} -exec nsqd -max-rdy-count "${MAX_READY_COUNT}" --data-path "${DATA_PATH}" +export CONFIG_PATH=${CONFIG_PATH:-/opt/nsq/conf/nsqd.cfg} +exec nsqd -config "${CONFIG_PATH}" diff --git a/rootfs/opt/nsq/conf/nsqd.cfg b/rootfs/opt/nsq/conf/nsqd.cfg new file mode 100644 index 0000000..2d534d5 --- /dev/null +++ b/rootfs/opt/nsq/conf/nsqd.cfg @@ -0,0 +1,9 @@ +## log verbosity level: debug, info, warn, error, or fatal +log-level = "warn" +verbose = false + +## path to store disk-backed messages +# data_path = "/opt/nsq/data" + +## maximum RDY count for a client +max_rdy_count = 10000 \ No newline at end of file