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 #166 from infosiftr/stretch-alpine 

Update to Debian Stretch and Alpine 3.6, removing erlang-solutions
This commit is contained in:
Tianon Gravi 2017-06-19 09:22:51 -07:00 committed by GitHub
parent 529237b760 192f4c2055
commit 2a7367330e
2 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
3.6/alpine/Dockerfile
View File

@ -1,4 +1,4 @@
FROM alpine:3.5 FROM alpine:3.6
# add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
RUN addgroup -S rabbitmq && adduser -S -h /var/lib/rabbitmq -G rabbitmq rabbitmq RUN addgroup -S rabbitmq && adduser -S -h /var/lib/rabbitmq -G rabbitmq rabbitmq
@ -54,7 +54,7 @@ RUN set -ex; \
export GNUPGHOME="$(mktemp -d)"; \ export GNUPGHOME="$(mktemp -d)"; \
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPG_KEY"; \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPG_KEY"; \
gpg --batch --verify rabbitmq-server.tar.xz.asc rabbitmq-server.tar.xz; \ gpg --batch --verify rabbitmq-server.tar.xz.asc rabbitmq-server.tar.xz; \
rm -r "$GNUPGHOME" rabbitmq-server.tar.xz.asc; \ rm -rf "$GNUPGHOME" rabbitmq-server.tar.xz.asc; \
\ \
mkdir -p "$RABBITMQ_HOME"; \ mkdir -p "$RABBITMQ_HOME"; \
tar \ tar \

29
3.6/debian/Dockerfile
View File

@ -1,10 +1,18 @@
FROM debian:jessie FROM debian:stretch-slim
RUN set -ex; \
apt-get update; \
apt-get install -y --no-install-recommends \
gnupg2 \
dirmngr \
; \
rm -rf /var/lib/apt/lists/*
# add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
RUN groupadd -r rabbitmq && useradd -r -d /var/lib/rabbitmq -m -g rabbitmq rabbitmq RUN groupadd -r rabbitmq && useradd -r -d /var/lib/rabbitmq -m -g rabbitmq rabbitmq
# grab gosu for easy step-down from root # grab gosu for easy step-down from root
ENV GOSU_VERSION 1.7 ENV GOSU_VERSION 1.10
RUN set -x \ RUN set -x \
&& apt-get update && apt-get install -y --no-install-recommends ca-certificates wget && rm -rf /var/lib/apt/lists/* \ && apt-get update && apt-get install -y --no-install-recommends ca-certificates wget && rm -rf /var/lib/apt/lists/* \
&& wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture)" \ && wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture)" \
@ -12,24 +20,11 @@ RUN set -x \
&& export GNUPGHOME="$(mktemp -d)" \ && export GNUPGHOME="$(mktemp -d)" \
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
&& gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \ && gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \
&& rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \ && rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \
&& chmod +x /usr/local/bin/gosu \ && chmod +x /usr/local/bin/gosu \
&& gosu nobody true \ && gosu nobody true \
&& apt-get purge -y --auto-remove ca-certificates wget && apt-get purge -y --auto-remove ca-certificates wget
# Add the officially endorsed Erlang debian repository:
# See:
# - http://www.erlang.org/download.html
# - https://www.erlang-solutions.com/resources/download.html
RUN set -ex; \
key='434975BD900CCBE4F7EE1B1ED208507CA14F4FCA'; \
export GNUPGHOME="$(mktemp -d)"; \
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
gpg --export "$key" > /etc/apt/trusted.gpg.d/erlang-solutions.gpg; \
rm -r "$GNUPGHOME"; \
apt-key list
RUN echo 'deb http://packages.erlang-solutions.com/debian jessie contrib' > /etc/apt/sources.list.d/erlang.list
# install Erlang # install Erlang
RUN apt-get update \ RUN apt-get update \
&& apt-get install -y --no-install-recommends \ && apt-get install -y --no-install-recommends \
@ -57,7 +52,7 @@ RUN set -ex; \
export GNUPGHOME="$(mktemp -d)"; \ export GNUPGHOME="$(mktemp -d)"; \
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
gpg --export "$key" > /etc/apt/trusted.gpg.d/rabbitmq.gpg; \ gpg --export "$key" > /etc/apt/trusted.gpg.d/rabbitmq.gpg; \
rm -r "$GNUPGHOME"; \ rm -rf "$GNUPGHOME"; \
apt-key list apt-key list
RUN echo 'deb http://www.rabbitmq.com/debian testing main' > /etc/apt/sources.list.d/rabbitmq.list RUN echo 'deb http://www.rabbitmq.com/debian testing main' > /etc/apt/sources.list.d/rabbitmq.list