Skip to content

Commit

Permalink
Merge pull request #8 from doopai/feature/upgrading-nsqd-version-1.1.0
Browse files Browse the repository at this point in the history
feat(nsq): using official maintenance of the base image
  • Loading branch information
Cryptophobia authored Nov 15, 2018
2 parents 2464eb3 + be64d93 commit ec4eb14
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 14 deletions.
23 changes: 10 additions & 13 deletions rootfs/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,17 +1,14 @@
FROM quay.io/deis/base:v0.3.6
FROM nsqio/nsq:v1.1.0

RUN adduser --system \
--shell /bin/bash \
--disabled-password \
--home /opt/nsq \
--group \
nsq \
&& curl -Ls https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 > /usr/bin/jq \
&& chmod +x /usr/bin/jq \
&& curl -sL https://github.com/nsqio/nsq/releases/download/v1.1.0/nsq-1.1.0.linux-amd64.go1.10.3.tar.gz | tar xz \
&& mv /nsq-1.1.0.linux-amd64.go1.10.3/bin/* /bin \
&& rm -r /nsq-1.1.0.linux-amd64.go1.10.3 \
&& mkdir /opt/nsq/data
RUN mkdir -p /opt/nsq/data \
&& adduser \
-s /bin/sh \
-D \
-h /opt/nsq \
nsq \
nsq

ADD https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64 /usr/bin/jq

COPY . /
RUN chown -R nsq:nsq /opt/nsq
Expand Down
2 changes: 1 addition & 1 deletion rootfs/opt/nsq/bin/start-nsqd
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/bin/sh
set -eo pipefail

export CONFIG_PATH=${CONFIG_PATH:-/opt/nsq/conf/nsqd.cfg}
Expand Down

0 comments on commit ec4eb14

Please sign in to comment.