diff --git a/rootfs/Dockerfile b/rootfs/Dockerfile index b3eacab..453a517 100644 --- a/rootfs/Dockerfile +++ b/rootfs/Dockerfile @@ -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 diff --git a/rootfs/opt/nsq/bin/start-nsqd b/rootfs/opt/nsq/bin/start-nsqd index 39e9ff1..559a40b 100755 --- a/rootfs/opt/nsq/bin/start-nsqd +++ b/rootfs/opt/nsq/bin/start-nsqd @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh set -eo pipefail export CONFIG_PATH=${CONFIG_PATH:-/opt/nsq/conf/nsqd.cfg}