Skip to content

Commit ec4eb14

Browse files
authored
Merge pull request #8 from doopai/feature/upgrading-nsqd-version-1.1.0
feat(nsq): using official maintenance of the base image
2 parents 2464eb3 + be64d93 commit ec4eb14

File tree

2 files changed

+11
-14
lines changed

2 files changed

+11
-14
lines changed

rootfs/Dockerfile

+10-13
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
1-
FROM quay.io/deis/base:v0.3.6
1+
FROM nsqio/nsq:v1.1.0
22

3-
RUN adduser --system \
4-
--shell /bin/bash \
5-
--disabled-password \
6-
--home /opt/nsq \
7-
--group \
8-
nsq \
9-
&& curl -Ls https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 > /usr/bin/jq \
10-
&& chmod +x /usr/bin/jq \
11-
&& 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 \
12-
&& mv /nsq-1.1.0.linux-amd64.go1.10.3/bin/* /bin \
13-
&& rm -r /nsq-1.1.0.linux-amd64.go1.10.3 \
14-
&& mkdir /opt/nsq/data
3+
RUN mkdir -p /opt/nsq/data \
4+
&& adduser \
5+
-s /bin/sh \
6+
-D \
7+
-h /opt/nsq \
8+
nsq \
9+
nsq
10+
11+
ADD https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64 /usr/bin/jq
1512

1613
COPY . /
1714
RUN chown -R nsq:nsq /opt/nsq

rootfs/opt/nsq/bin/start-nsqd

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/bin/sh
22
set -eo pipefail
33

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

0 commit comments

Comments
 (0)