Skip to content

Commit

Permalink
Enable shell expansion.
Browse files Browse the repository at this point in the history
We're changing from scratch to busybox as a base image, after discussion
in #543. This gives us some free shell expansion.

I also added a step at the end of dist.sh that would take care of
tagging the image as the "latest" build, as long as there's not a hyphen
in the version number (so our "latest" build will never be an alpha or
beta, as I assume we want stability by default).
  • Loading branch information
Paddy Foran committed Feb 20, 2015
1 parent 04e0f27 commit 860a768
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
4 changes: 3 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
FROM scratch
FROM busybox

ADD dist/docker/bin/ /

EXPOSE 4150 4151 4160 4161 4170 4171

VOLUME /data
VOLUME /etc/ssl/certs
5 changes: 5 additions & 0 deletions dist.sh
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,8 @@ for os in linux darwin; do
done

docker build -t nsqio/nsq:v$version .
if [[ ! $version == *"-"* ]]
then
echo "Tagging nsqio/nsq:v${version} as the latest release.";
docker tag -f nsqio/nsq:v$version nsqio/nsq:latest
fi

0 comments on commit 860a768

Please sign in to comment.