docker-library
/
rabbitmq
mirror of https://github.com/docker-library/rabbitmq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #41 from infosiftr/3.5.5 

Update to 3.5.5, removing tini
This commit is contained in:
Tianon Gravi 2015-09-24 11:14:17 -07:00
parent 7fbd1dbf0a df489e80ce
commit ccb131dedd
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Dockerfile
View File

@ -13,12 +13,6 @@ RUN curl -o /usr/local/bin/gosu -SL "https://github.com/tianon/gosu/releases/dow
&& rm /usr/local/bin/gosu.asc \
&& chmod +x /usr/local/bin/gosu
# grab tini for signal processing and zombie killing
RUN set -x \
&& curl -fSL "https://github.com/krallin/tini/releases/download/v0.5.0/tini" -o /usr/local/bin/tini \
&& chmod +x /usr/local/bin/tini \
&& tini -h
# Add the officially endorsed Erlang debian repository:
# See:
# - http://www.erlang.org/download.html
@ -35,7 +29,7 @@ ENV RABBITMQ_LOGS=- RABBITMQ_SASL_LOGS=-
RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys F78372A06FF50C80464FC1B4F7B8CEA6056E8E56
RUN echo 'deb http://www.rabbitmq.com/debian/ testing main' > /etc/apt/sources.list.d/rabbitmq.list
ENV RABBITMQ_VERSION 3.5.4-1
ENV RABBITMQ_VERSION 3.5.5-1
RUN apt-get update && apt-get install -y rabbitmq-server=$RABBITMQ_VERSION --no-install-recommends && rm -rf /var/lib/apt/lists/*

2
docker-entrypoint.sh
View File

@ -57,7 +57,7 @@ if [ "$1" = 'rabbitmq-server' ]; then
fi
chown -R rabbitmq /var/lib/rabbitmq
set -- gosu rabbitmq tini -- "$@"
set -- gosu rabbitmq "$@"
fi
exec "$@"