From 1d0e9b18d06d8847a6c71e8ee8f05b42089137cc Mon Sep 17 00:00:00 2001 From: Joe Ferguson Date: Wed, 24 Sep 2014 16:23:06 -0600 Subject: [PATCH 1/3] update to be more like mongo/postgre to use entrypoint to chown data dir --- 2.6.17/Dockerfile | 15 ++++++++++++--- 2.6.17/docker-entrypoint.sh | 9 +++++++++ 2.8.10/Dockerfile | 15 ++++++++++++--- 2.8.10/docker-entrypoint.sh | 9 +++++++++ 2.8.11/Dockerfile | 15 ++++++++++++--- 2.8.11/docker-entrypoint.sh | 9 +++++++++ 2.8.12/Dockerfile | 15 ++++++++++++--- 2.8.12/docker-entrypoint.sh | 9 +++++++++ 2.8.13/Dockerfile | 15 ++++++++++++--- 2.8.13/docker-entrypoint.sh | 9 +++++++++ 2.8.6/Dockerfile | 15 ++++++++++++--- 2.8.6/docker-entrypoint.sh | 9 +++++++++ 2.8.7/Dockerfile | 15 ++++++++++++--- 2.8.7/docker-entrypoint.sh | 9 +++++++++ 2.8.8/Dockerfile | 15 ++++++++++++--- 2.8.8/docker-entrypoint.sh | 9 +++++++++ 2.8.9/Dockerfile | 15 ++++++++++++--- 2.8.9/docker-entrypoint.sh | 9 +++++++++ 18 files changed, 189 insertions(+), 27 deletions(-) create mode 100644 2.6.17/docker-entrypoint.sh create mode 100644 2.8.10/docker-entrypoint.sh create mode 100644 2.8.11/docker-entrypoint.sh create mode 100644 2.8.12/docker-entrypoint.sh create mode 100644 2.8.13/docker-entrypoint.sh create mode 100644 2.8.6/docker-entrypoint.sh create mode 100644 2.8.7/docker-entrypoint.sh create mode 100644 2.8.8/docker-entrypoint.sh create mode 100644 2.8.9/docker-entrypoint.sh diff --git a/2.6.17/Dockerfile b/2.6.17/Dockerfile index 6debc0fcf..734607689 100644 --- a/2.6.17/Dockerfile +++ b/2.6.17/Dockerfile @@ -3,13 +3,20 @@ FROM debian:wheezy # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added RUN groupadd -r redis && useradd -r -g redis redis +RUN apt-get update \ + && apt-get install -y curl \ + && rm -rf /var/lib/apt/lists/* + +RUN curl -o /usr/local/bin/gosu -SL 'https://github.com/tianon/gosu/releases/download/1.1/gosu' \ + && chmod +x /usr/local/bin/gosu + ENV REDIS_VERSION 2.6.17 ENV REDIS_DOWNLOAD_URL http://download.redis.io/releases/redis-2.6.17.tar.gz ENV REDIS_DOWNLOAD_SHA1 b5423e1c423d502074cbd0b21bd4e820409d2003 RUN buildDeps='gcc libc6-dev make'; \ set -x; \ - apt-get update && apt-get install -y $buildDeps curl --no-install-recommends \ + apt-get update && apt-get install -y $buildDeps --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ && mkdir -p /usr/src/redis \ && curl -sSL "$REDIS_DOWNLOAD_URL" -o redis.tar.gz \ @@ -19,13 +26,15 @@ RUN buildDeps='gcc libc6-dev make'; \ && make -C /usr/src/redis \ && make -C /usr/src/redis install \ && rm -r /usr/src/redis \ - && apt-get purge -y $buildDeps curl \ + && apt-get purge -y $buildDeps \ && apt-get autoremove -y RUN mkdir /data && chown redis:redis /data VOLUME /data WORKDIR /data -USER redis +COPY docker-entrypoint.sh /entrypoint.sh +ENTRYPOINT ["/entrypoint.sh"] + EXPOSE 6379 CMD [ "redis-server" ] diff --git a/2.6.17/docker-entrypoint.sh b/2.6.17/docker-entrypoint.sh new file mode 100644 index 000000000..6d5b33b37 --- /dev/null +++ b/2.6.17/docker-entrypoint.sh @@ -0,0 +1,9 @@ +#!/bin/bash +set -e + +if [ "$1" = 'redis-server' ]; then + chown -R redis /data + exec gosu redis "$@" +fi + +exec "$@" diff --git a/2.8.10/Dockerfile b/2.8.10/Dockerfile index d48d15fa4..d4af91111 100644 --- a/2.8.10/Dockerfile +++ b/2.8.10/Dockerfile @@ -3,13 +3,20 @@ FROM debian:wheezy # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added RUN groupadd -r redis && useradd -r -g redis redis +RUN apt-get update \ + && apt-get install -y curl \ + && rm -rf /var/lib/apt/lists/* + +RUN curl -o /usr/local/bin/gosu -SL 'https://github.com/tianon/gosu/releases/download/1.1/gosu' \ + && chmod +x /usr/local/bin/gosu + ENV REDIS_VERSION 2.8.10 ENV REDIS_DOWNLOAD_URL http://download.redis.io/releases/redis-2.8.10.tar.gz ENV REDIS_DOWNLOAD_SHA1 339ddf82e01a16ad912d1c1d59b02f3fab58d9d9 RUN buildDeps='gcc libc6-dev make'; \ set -x; \ - apt-get update && apt-get install -y $buildDeps curl --no-install-recommends \ + apt-get update && apt-get install -y $buildDeps --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ && mkdir -p /usr/src/redis \ && curl -sSL "$REDIS_DOWNLOAD_URL" -o redis.tar.gz \ @@ -19,13 +26,15 @@ RUN buildDeps='gcc libc6-dev make'; \ && make -C /usr/src/redis \ && make -C /usr/src/redis install \ && rm -r /usr/src/redis \ - && apt-get purge -y $buildDeps curl \ + && apt-get purge -y $buildDeps \ && apt-get autoremove -y RUN mkdir /data && chown redis:redis /data VOLUME /data WORKDIR /data -USER redis +COPY docker-entrypoint.sh /entrypoint.sh +ENTRYPOINT ["/entrypoint.sh"] + EXPOSE 6379 CMD [ "redis-server" ] diff --git a/2.8.10/docker-entrypoint.sh b/2.8.10/docker-entrypoint.sh new file mode 100644 index 000000000..6d5b33b37 --- /dev/null +++ b/2.8.10/docker-entrypoint.sh @@ -0,0 +1,9 @@ +#!/bin/bash +set -e + +if [ "$1" = 'redis-server' ]; then + chown -R redis /data + exec gosu redis "$@" +fi + +exec "$@" diff --git a/2.8.11/Dockerfile b/2.8.11/Dockerfile index 6df77993c..b69e98715 100644 --- a/2.8.11/Dockerfile +++ b/2.8.11/Dockerfile @@ -3,13 +3,20 @@ FROM debian:wheezy # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added RUN groupadd -r redis && useradd -r -g redis redis +RUN apt-get update \ + && apt-get install -y curl \ + && rm -rf /var/lib/apt/lists/* + +RUN curl -o /usr/local/bin/gosu -SL 'https://github.com/tianon/gosu/releases/download/1.1/gosu' \ + && chmod +x /usr/local/bin/gosu + ENV REDIS_VERSION 2.8.11 ENV REDIS_DOWNLOAD_URL http://download.redis.io/releases/redis-2.8.11.tar.gz ENV REDIS_DOWNLOAD_SHA1 3e3a4603781514f239f040287d3ef1097eb02a76 RUN buildDeps='gcc libc6-dev make'; \ set -x; \ - apt-get update && apt-get install -y $buildDeps curl --no-install-recommends \ + apt-get update && apt-get install -y $buildDeps --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ && mkdir -p /usr/src/redis \ && curl -sSL "$REDIS_DOWNLOAD_URL" -o redis.tar.gz \ @@ -19,13 +26,15 @@ RUN buildDeps='gcc libc6-dev make'; \ && make -C /usr/src/redis \ && make -C /usr/src/redis install \ && rm -r /usr/src/redis \ - && apt-get purge -y $buildDeps curl \ + && apt-get purge -y $buildDeps \ && apt-get autoremove -y RUN mkdir /data && chown redis:redis /data VOLUME /data WORKDIR /data -USER redis +COPY docker-entrypoint.sh /entrypoint.sh +ENTRYPOINT ["/entrypoint.sh"] + EXPOSE 6379 CMD [ "redis-server" ] diff --git a/2.8.11/docker-entrypoint.sh b/2.8.11/docker-entrypoint.sh new file mode 100644 index 000000000..6d5b33b37 --- /dev/null +++ b/2.8.11/docker-entrypoint.sh @@ -0,0 +1,9 @@ +#!/bin/bash +set -e + +if [ "$1" = 'redis-server' ]; then + chown -R redis /data + exec gosu redis "$@" +fi + +exec "$@" diff --git a/2.8.12/Dockerfile b/2.8.12/Dockerfile index 392402657..580483227 100644 --- a/2.8.12/Dockerfile +++ b/2.8.12/Dockerfile @@ -3,13 +3,20 @@ FROM debian:wheezy # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added RUN groupadd -r redis && useradd -r -g redis redis +RUN apt-get update \ + && apt-get install -y curl \ + && rm -rf /var/lib/apt/lists/* + +RUN curl -o /usr/local/bin/gosu -SL 'https://github.com/tianon/gosu/releases/download/1.1/gosu' \ + && chmod +x /usr/local/bin/gosu + ENV REDIS_VERSION 2.8.12 ENV REDIS_DOWNLOAD_URL http://download.redis.io/releases/redis-2.8.12.tar.gz ENV REDIS_DOWNLOAD_SHA1 56c86a4f9eccaf29f934433c7c67a175e404b2f6 RUN buildDeps='gcc libc6-dev make'; \ set -x; \ - apt-get update && apt-get install -y $buildDeps curl --no-install-recommends \ + apt-get update && apt-get install -y $buildDeps --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ && mkdir -p /usr/src/redis \ && curl -sSL "$REDIS_DOWNLOAD_URL" -o redis.tar.gz \ @@ -19,13 +26,15 @@ RUN buildDeps='gcc libc6-dev make'; \ && make -C /usr/src/redis \ && make -C /usr/src/redis install \ && rm -r /usr/src/redis \ - && apt-get purge -y $buildDeps curl \ + && apt-get purge -y $buildDeps \ && apt-get autoremove -y RUN mkdir /data && chown redis:redis /data VOLUME /data WORKDIR /data -USER redis +COPY docker-entrypoint.sh /entrypoint.sh +ENTRYPOINT ["/entrypoint.sh"] + EXPOSE 6379 CMD [ "redis-server" ] diff --git a/2.8.12/docker-entrypoint.sh b/2.8.12/docker-entrypoint.sh new file mode 100644 index 000000000..6d5b33b37 --- /dev/null +++ b/2.8.12/docker-entrypoint.sh @@ -0,0 +1,9 @@ +#!/bin/bash +set -e + +if [ "$1" = 'redis-server' ]; then + chown -R redis /data + exec gosu redis "$@" +fi + +exec "$@" diff --git a/2.8.13/Dockerfile b/2.8.13/Dockerfile index 40eabfe5a..ee7646568 100644 --- a/2.8.13/Dockerfile +++ b/2.8.13/Dockerfile @@ -3,13 +3,20 @@ FROM debian:wheezy # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added RUN groupadd -r redis && useradd -r -g redis redis +RUN apt-get update \ + && apt-get install -y curl \ + && rm -rf /var/lib/apt/lists/* + +RUN curl -o /usr/local/bin/gosu -SL 'https://github.com/tianon/gosu/releases/download/1.1/gosu' \ + && chmod +x /usr/local/bin/gosu + ENV REDIS_VERSION 2.8.13 ENV REDIS_DOWNLOAD_URL http://download.redis.io/releases/redis-2.8.13.tar.gz ENV REDIS_DOWNLOAD_SHA1 a72925a35849eb2d38a1ea076a3db82072d4ee43 RUN buildDeps='gcc libc6-dev make'; \ set -x; \ - apt-get update && apt-get install -y $buildDeps curl --no-install-recommends \ + apt-get update && apt-get install -y $buildDeps --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ && mkdir -p /usr/src/redis \ && curl -sSL "$REDIS_DOWNLOAD_URL" -o redis.tar.gz \ @@ -19,13 +26,15 @@ RUN buildDeps='gcc libc6-dev make'; \ && make -C /usr/src/redis \ && make -C /usr/src/redis install \ && rm -r /usr/src/redis \ - && apt-get purge -y $buildDeps curl \ + && apt-get purge -y $buildDeps \ && apt-get autoremove -y RUN mkdir /data && chown redis:redis /data VOLUME /data WORKDIR /data -USER redis +COPY docker-entrypoint.sh /entrypoint.sh +ENTRYPOINT ["/entrypoint.sh"] + EXPOSE 6379 CMD [ "redis-server" ] diff --git a/2.8.13/docker-entrypoint.sh b/2.8.13/docker-entrypoint.sh new file mode 100644 index 000000000..6d5b33b37 --- /dev/null +++ b/2.8.13/docker-entrypoint.sh @@ -0,0 +1,9 @@ +#!/bin/bash +set -e + +if [ "$1" = 'redis-server' ]; then + chown -R redis /data + exec gosu redis "$@" +fi + +exec "$@" diff --git a/2.8.6/Dockerfile b/2.8.6/Dockerfile index a8eff758d..ef9140ba2 100644 --- a/2.8.6/Dockerfile +++ b/2.8.6/Dockerfile @@ -3,13 +3,20 @@ FROM debian:wheezy # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added RUN groupadd -r redis && useradd -r -g redis redis +RUN apt-get update \ + && apt-get install -y curl \ + && rm -rf /var/lib/apt/lists/* + +RUN curl -o /usr/local/bin/gosu -SL 'https://github.com/tianon/gosu/releases/download/1.1/gosu' \ + && chmod +x /usr/local/bin/gosu + ENV REDIS_VERSION 2.8.6 ENV REDIS_DOWNLOAD_URL http://download.redis.io/releases/redis-2.8.6.tar.gz ENV REDIS_DOWNLOAD_SHA1 8680046580c75987961241f2e1e417c242b91a49 RUN buildDeps='gcc libc6-dev make'; \ set -x; \ - apt-get update && apt-get install -y $buildDeps curl --no-install-recommends \ + apt-get update && apt-get install -y $buildDeps --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ && mkdir -p /usr/src/redis \ && curl -sSL "$REDIS_DOWNLOAD_URL" -o redis.tar.gz \ @@ -19,13 +26,15 @@ RUN buildDeps='gcc libc6-dev make'; \ && make -C /usr/src/redis \ && make -C /usr/src/redis install \ && rm -r /usr/src/redis \ - && apt-get purge -y $buildDeps curl \ + && apt-get purge -y $buildDeps \ && apt-get autoremove -y RUN mkdir /data && chown redis:redis /data VOLUME /data WORKDIR /data -USER redis +COPY docker-entrypoint.sh /entrypoint.sh +ENTRYPOINT ["/entrypoint.sh"] + EXPOSE 6379 CMD [ "redis-server" ] diff --git a/2.8.6/docker-entrypoint.sh b/2.8.6/docker-entrypoint.sh new file mode 100644 index 000000000..6d5b33b37 --- /dev/null +++ b/2.8.6/docker-entrypoint.sh @@ -0,0 +1,9 @@ +#!/bin/bash +set -e + +if [ "$1" = 'redis-server' ]; then + chown -R redis /data + exec gosu redis "$@" +fi + +exec "$@" diff --git a/2.8.7/Dockerfile b/2.8.7/Dockerfile index 31b38c3cf..47c39ea05 100644 --- a/2.8.7/Dockerfile +++ b/2.8.7/Dockerfile @@ -3,13 +3,20 @@ FROM debian:wheezy # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added RUN groupadd -r redis && useradd -r -g redis redis +RUN apt-get update \ + && apt-get install -y curl \ + && rm -rf /var/lib/apt/lists/* + +RUN curl -o /usr/local/bin/gosu -SL 'https://github.com/tianon/gosu/releases/download/1.1/gosu' \ + && chmod +x /usr/local/bin/gosu + ENV REDIS_VERSION 2.8.7 ENV REDIS_DOWNLOAD_URL http://download.redis.io/releases/redis-2.8.7.tar.gz ENV REDIS_DOWNLOAD_SHA1 acc369093ec74223e6da207921595187f7e64998 RUN buildDeps='gcc libc6-dev make'; \ set -x; \ - apt-get update && apt-get install -y $buildDeps curl --no-install-recommends \ + apt-get update && apt-get install -y $buildDeps --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ && mkdir -p /usr/src/redis \ && curl -sSL "$REDIS_DOWNLOAD_URL" -o redis.tar.gz \ @@ -19,13 +26,15 @@ RUN buildDeps='gcc libc6-dev make'; \ && make -C /usr/src/redis \ && make -C /usr/src/redis install \ && rm -r /usr/src/redis \ - && apt-get purge -y $buildDeps curl \ + && apt-get purge -y $buildDeps \ && apt-get autoremove -y RUN mkdir /data && chown redis:redis /data VOLUME /data WORKDIR /data -USER redis +COPY docker-entrypoint.sh /entrypoint.sh +ENTRYPOINT ["/entrypoint.sh"] + EXPOSE 6379 CMD [ "redis-server" ] diff --git a/2.8.7/docker-entrypoint.sh b/2.8.7/docker-entrypoint.sh new file mode 100644 index 000000000..6d5b33b37 --- /dev/null +++ b/2.8.7/docker-entrypoint.sh @@ -0,0 +1,9 @@ +#!/bin/bash +set -e + +if [ "$1" = 'redis-server' ]; then + chown -R redis /data + exec gosu redis "$@" +fi + +exec "$@" diff --git a/2.8.8/Dockerfile b/2.8.8/Dockerfile index f7a9ef0ad..9be1cfac4 100644 --- a/2.8.8/Dockerfile +++ b/2.8.8/Dockerfile @@ -3,13 +3,20 @@ FROM debian:wheezy # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added RUN groupadd -r redis && useradd -r -g redis redis +RUN apt-get update \ + && apt-get install -y curl \ + && rm -rf /var/lib/apt/lists/* + +RUN curl -o /usr/local/bin/gosu -SL 'https://github.com/tianon/gosu/releases/download/1.1/gosu' \ + && chmod +x /usr/local/bin/gosu + ENV REDIS_VERSION 2.8.8 ENV REDIS_DOWNLOAD_URL http://download.redis.io/releases/redis-2.8.8.tar.gz ENV REDIS_DOWNLOAD_SHA1 aa811f399db58c92c8ec5e48271d307e9ab8eb81 RUN buildDeps='gcc libc6-dev make'; \ set -x; \ - apt-get update && apt-get install -y $buildDeps curl --no-install-recommends \ + apt-get update && apt-get install -y $buildDeps --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ && mkdir -p /usr/src/redis \ && curl -sSL "$REDIS_DOWNLOAD_URL" -o redis.tar.gz \ @@ -19,13 +26,15 @@ RUN buildDeps='gcc libc6-dev make'; \ && make -C /usr/src/redis \ && make -C /usr/src/redis install \ && rm -r /usr/src/redis \ - && apt-get purge -y $buildDeps curl \ + && apt-get purge -y $buildDeps \ && apt-get autoremove -y RUN mkdir /data && chown redis:redis /data VOLUME /data WORKDIR /data -USER redis +COPY docker-entrypoint.sh /entrypoint.sh +ENTRYPOINT ["/entrypoint.sh"] + EXPOSE 6379 CMD [ "redis-server" ] diff --git a/2.8.8/docker-entrypoint.sh b/2.8.8/docker-entrypoint.sh new file mode 100644 index 000000000..6d5b33b37 --- /dev/null +++ b/2.8.8/docker-entrypoint.sh @@ -0,0 +1,9 @@ +#!/bin/bash +set -e + +if [ "$1" = 'redis-server' ]; then + chown -R redis /data + exec gosu redis "$@" +fi + +exec "$@" diff --git a/2.8.9/Dockerfile b/2.8.9/Dockerfile index 14483990b..c96a897c1 100644 --- a/2.8.9/Dockerfile +++ b/2.8.9/Dockerfile @@ -3,13 +3,20 @@ FROM debian:wheezy # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added RUN groupadd -r redis && useradd -r -g redis redis +RUN apt-get update \ + && apt-get install -y curl \ + && rm -rf /var/lib/apt/lists/* + +RUN curl -o /usr/local/bin/gosu -SL 'https://github.com/tianon/gosu/releases/download/1.1/gosu' \ + && chmod +x /usr/local/bin/gosu + ENV REDIS_VERSION 2.8.9 ENV REDIS_DOWNLOAD_URL http://download.redis.io/releases/redis-2.8.9.tar.gz ENV REDIS_DOWNLOAD_SHA1 003ccdc175816e0a751919cf508f1318e54aac1e RUN buildDeps='gcc libc6-dev make'; \ set -x; \ - apt-get update && apt-get install -y $buildDeps curl --no-install-recommends \ + apt-get update && apt-get install -y $buildDeps --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ && mkdir -p /usr/src/redis \ && curl -sSL "$REDIS_DOWNLOAD_URL" -o redis.tar.gz \ @@ -19,13 +26,15 @@ RUN buildDeps='gcc libc6-dev make'; \ && make -C /usr/src/redis \ && make -C /usr/src/redis install \ && rm -r /usr/src/redis \ - && apt-get purge -y $buildDeps curl \ + && apt-get purge -y $buildDeps \ && apt-get autoremove -y RUN mkdir /data && chown redis:redis /data VOLUME /data WORKDIR /data -USER redis +COPY docker-entrypoint.sh /entrypoint.sh +ENTRYPOINT ["/entrypoint.sh"] + EXPOSE 6379 CMD [ "redis-server" ] diff --git a/2.8.9/docker-entrypoint.sh b/2.8.9/docker-entrypoint.sh new file mode 100644 index 000000000..6d5b33b37 --- /dev/null +++ b/2.8.9/docker-entrypoint.sh @@ -0,0 +1,9 @@ +#!/bin/bash +set -e + +if [ "$1" = 'redis-server' ]; then + chown -R redis /data + exec gosu redis "$@" +fi + +exec "$@" From fdaeed53263f719d07735502301b3068d7b740ba Mon Sep 17 00:00:00 2001 From: Joe Ferguson Date: Wed, 24 Sep 2014 16:23:39 -0600 Subject: [PATCH 2/3] more versions that have been released --- 2.8.14/Dockerfile | 40 +++++++++++++++++++++++++++++++++++ 2.8.14/docker-entrypoint.sh | 9 ++++++++ 2.8.15/Dockerfile | 40 +++++++++++++++++++++++++++++++++++ 2.8.15/docker-entrypoint.sh | 9 ++++++++ 2.8.16/Dockerfile | 40 +++++++++++++++++++++++++++++++++++ 2.8.16/docker-entrypoint.sh | 9 ++++++++ 2.8.17/Dockerfile | 40 +++++++++++++++++++++++++++++++++++ 2.8.17/docker-entrypoint.sh | 9 ++++++++ generate-stackbrew-library.sh | 2 +- 9 files changed, 197 insertions(+), 1 deletion(-) create mode 100644 2.8.14/Dockerfile create mode 100644 2.8.14/docker-entrypoint.sh create mode 100644 2.8.15/Dockerfile create mode 100644 2.8.15/docker-entrypoint.sh create mode 100644 2.8.16/Dockerfile create mode 100644 2.8.16/docker-entrypoint.sh create mode 100644 2.8.17/Dockerfile create mode 100644 2.8.17/docker-entrypoint.sh diff --git a/2.8.14/Dockerfile b/2.8.14/Dockerfile new file mode 100644 index 000000000..f0b1aeca1 --- /dev/null +++ b/2.8.14/Dockerfile @@ -0,0 +1,40 @@ +FROM debian:wheezy + +# add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added +RUN groupadd -r redis && useradd -r -g redis redis + +RUN apt-get update \ + && apt-get install -y curl \ + && rm -rf /var/lib/apt/lists/* + +RUN curl -o /usr/local/bin/gosu -SL 'https://github.com/tianon/gosu/releases/download/1.1/gosu' \ + && chmod +x /usr/local/bin/gosu + +ENV REDIS_VERSION 2.8.14 +ENV REDIS_DOWNLOAD_URL http://download.redis.io/releases/redis-2.8.14.tar.gz +ENV REDIS_DOWNLOAD_SHA1 fd0edc045f2b53057d7f6ab38e2fe99086c87e8d + +RUN buildDeps='gcc libc6-dev make'; \ + set -x; \ + apt-get update && apt-get install -y $buildDeps --no-install-recommends \ + && rm -rf /var/lib/apt/lists/* \ + && mkdir -p /usr/src/redis \ + && curl -sSL "$REDIS_DOWNLOAD_URL" -o redis.tar.gz \ + && echo "$REDIS_DOWNLOAD_SHA1 *redis.tar.gz" | sha1sum -c - \ + && tar -xzf redis.tar.gz -C /usr/src/redis --strip-components=1 \ + && rm redis.tar.gz \ + && make -C /usr/src/redis \ + && make -C /usr/src/redis install \ + && rm -r /usr/src/redis \ + && apt-get purge -y $buildDeps \ + && apt-get autoremove -y + +RUN mkdir /data && chown redis:redis /data +VOLUME /data +WORKDIR /data + +COPY docker-entrypoint.sh /entrypoint.sh +ENTRYPOINT ["/entrypoint.sh"] + +EXPOSE 6379 +CMD [ "redis-server" ] diff --git a/2.8.14/docker-entrypoint.sh b/2.8.14/docker-entrypoint.sh new file mode 100644 index 000000000..6d5b33b37 --- /dev/null +++ b/2.8.14/docker-entrypoint.sh @@ -0,0 +1,9 @@ +#!/bin/bash +set -e + +if [ "$1" = 'redis-server' ]; then + chown -R redis /data + exec gosu redis "$@" +fi + +exec "$@" diff --git a/2.8.15/Dockerfile b/2.8.15/Dockerfile new file mode 100644 index 000000000..27c310398 --- /dev/null +++ b/2.8.15/Dockerfile @@ -0,0 +1,40 @@ +FROM debian:wheezy + +# add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added +RUN groupadd -r redis && useradd -r -g redis redis + +RUN apt-get update \ + && apt-get install -y curl \ + && rm -rf /var/lib/apt/lists/* + +RUN curl -o /usr/local/bin/gosu -SL 'https://github.com/tianon/gosu/releases/download/1.1/gosu' \ + && chmod +x /usr/local/bin/gosu + +ENV REDIS_VERSION 2.8.15 +ENV REDIS_DOWNLOAD_URL http://download.redis.io/releases/redis-2.8.15.tar.gz +ENV REDIS_DOWNLOAD_SHA1 afc0d753cea68a26038775df2dea75a76e3d0e1d + +RUN buildDeps='gcc libc6-dev make'; \ + set -x; \ + apt-get update && apt-get install -y $buildDeps --no-install-recommends \ + && rm -rf /var/lib/apt/lists/* \ + && mkdir -p /usr/src/redis \ + && curl -sSL "$REDIS_DOWNLOAD_URL" -o redis.tar.gz \ + && echo "$REDIS_DOWNLOAD_SHA1 *redis.tar.gz" | sha1sum -c - \ + && tar -xzf redis.tar.gz -C /usr/src/redis --strip-components=1 \ + && rm redis.tar.gz \ + && make -C /usr/src/redis \ + && make -C /usr/src/redis install \ + && rm -r /usr/src/redis \ + && apt-get purge -y $buildDeps \ + && apt-get autoremove -y + +RUN mkdir /data && chown redis:redis /data +VOLUME /data +WORKDIR /data + +COPY docker-entrypoint.sh /entrypoint.sh +ENTRYPOINT ["/entrypoint.sh"] + +EXPOSE 6379 +CMD [ "redis-server" ] diff --git a/2.8.15/docker-entrypoint.sh b/2.8.15/docker-entrypoint.sh new file mode 100644 index 000000000..6d5b33b37 --- /dev/null +++ b/2.8.15/docker-entrypoint.sh @@ -0,0 +1,9 @@ +#!/bin/bash +set -e + +if [ "$1" = 'redis-server' ]; then + chown -R redis /data + exec gosu redis "$@" +fi + +exec "$@" diff --git a/2.8.16/Dockerfile b/2.8.16/Dockerfile new file mode 100644 index 000000000..b9ee83813 --- /dev/null +++ b/2.8.16/Dockerfile @@ -0,0 +1,40 @@ +FROM debian:wheezy + +# add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added +RUN groupadd -r redis && useradd -r -g redis redis + +RUN apt-get update \ + && apt-get install -y curl \ + && rm -rf /var/lib/apt/lists/* + +RUN curl -o /usr/local/bin/gosu -SL 'https://github.com/tianon/gosu/releases/download/1.1/gosu' \ + && chmod +x /usr/local/bin/gosu + +ENV REDIS_VERSION 2.8.16 +ENV REDIS_DOWNLOAD_URL http://download.redis.io/releases/redis-2.8.16.tar.gz +ENV REDIS_DOWNLOAD_SHA1 198045c8291dd832788ac8a17d2e565752499942 + +RUN buildDeps='gcc libc6-dev make'; \ + set -x; \ + apt-get update && apt-get install -y $buildDeps --no-install-recommends \ + && rm -rf /var/lib/apt/lists/* \ + && mkdir -p /usr/src/redis \ + && curl -sSL "$REDIS_DOWNLOAD_URL" -o redis.tar.gz \ + && echo "$REDIS_DOWNLOAD_SHA1 *redis.tar.gz" | sha1sum -c - \ + && tar -xzf redis.tar.gz -C /usr/src/redis --strip-components=1 \ + && rm redis.tar.gz \ + && make -C /usr/src/redis \ + && make -C /usr/src/redis install \ + && rm -r /usr/src/redis \ + && apt-get purge -y $buildDeps \ + && apt-get autoremove -y + +RUN mkdir /data && chown redis:redis /data +VOLUME /data +WORKDIR /data + +COPY docker-entrypoint.sh /entrypoint.sh +ENTRYPOINT ["/entrypoint.sh"] + +EXPOSE 6379 +CMD [ "redis-server" ] diff --git a/2.8.16/docker-entrypoint.sh b/2.8.16/docker-entrypoint.sh new file mode 100644 index 000000000..6d5b33b37 --- /dev/null +++ b/2.8.16/docker-entrypoint.sh @@ -0,0 +1,9 @@ +#!/bin/bash +set -e + +if [ "$1" = 'redis-server' ]; then + chown -R redis /data + exec gosu redis "$@" +fi + +exec "$@" diff --git a/2.8.17/Dockerfile b/2.8.17/Dockerfile new file mode 100644 index 000000000..9933070fc --- /dev/null +++ b/2.8.17/Dockerfile @@ -0,0 +1,40 @@ +FROM debian:wheezy + +# add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added +RUN groupadd -r redis && useradd -r -g redis redis + +RUN apt-get update \ + && apt-get install -y curl \ + && rm -rf /var/lib/apt/lists/* + +RUN curl -o /usr/local/bin/gosu -SL 'https://github.com/tianon/gosu/releases/download/1.1/gosu' \ + && chmod +x /usr/local/bin/gosu + +ENV REDIS_VERSION 2.8.17 +ENV REDIS_DOWNLOAD_URL http://download.redis.io/releases/redis-2.8.17.tar.gz +ENV REDIS_DOWNLOAD_SHA1 913479f9d2a283bfaadd1444e17e7bab560e5d1e + +RUN buildDeps='gcc libc6-dev make'; \ + set -x; \ + apt-get update && apt-get install -y $buildDeps --no-install-recommends \ + && rm -rf /var/lib/apt/lists/* \ + && mkdir -p /usr/src/redis \ + && curl -sSL "$REDIS_DOWNLOAD_URL" -o redis.tar.gz \ + && echo "$REDIS_DOWNLOAD_SHA1 *redis.tar.gz" | sha1sum -c - \ + && tar -xzf redis.tar.gz -C /usr/src/redis --strip-components=1 \ + && rm redis.tar.gz \ + && make -C /usr/src/redis \ + && make -C /usr/src/redis install \ + && rm -r /usr/src/redis \ + && apt-get purge -y $buildDeps \ + && apt-get autoremove -y + +RUN mkdir /data && chown redis:redis /data +VOLUME /data +WORKDIR /data + +COPY docker-entrypoint.sh /entrypoint.sh +ENTRYPOINT ["/entrypoint.sh"] + +EXPOSE 6379 +CMD [ "redis-server" ] diff --git a/2.8.17/docker-entrypoint.sh b/2.8.17/docker-entrypoint.sh new file mode 100644 index 000000000..6d5b33b37 --- /dev/null +++ b/2.8.17/docker-entrypoint.sh @@ -0,0 +1,9 @@ +#!/bin/bash +set -e + +if [ "$1" = 'redis-server' ]; then + chown -R redis /data + exec gosu redis "$@" +fi + +exec "$@" diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index 70f75ee68..f55400eed 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -3,7 +3,7 @@ set -e declare -A aliases aliases=( - [2.8.13]='2.8 latest' + [2.8.17]='2.8 latest' [2.6.17]='2.6' ) From d9ec31cfa11cfaa9bf3db6b26a59b8b7402f81dc Mon Sep 17 00:00:00 2001 From: Joe Ferguson Date: Wed, 24 Sep 2014 16:37:04 -0600 Subject: [PATCH 3/3] These need execute, take advantage of the workdir --- 2.6.17/docker-entrypoint.sh | 2 +- 2.8.10/docker-entrypoint.sh | 2 +- 2.8.11/docker-entrypoint.sh | 2 +- 2.8.12/docker-entrypoint.sh | 2 +- 2.8.13/docker-entrypoint.sh | 2 +- 2.8.14/docker-entrypoint.sh | 2 +- 2.8.15/docker-entrypoint.sh | 2 +- 2.8.16/docker-entrypoint.sh | 2 +- 2.8.17/docker-entrypoint.sh | 2 +- 2.8.6/docker-entrypoint.sh | 2 +- 2.8.7/docker-entrypoint.sh | 2 +- 2.8.8/docker-entrypoint.sh | 2 +- 2.8.9/docker-entrypoint.sh | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) mode change 100644 => 100755 2.6.17/docker-entrypoint.sh mode change 100644 => 100755 2.8.10/docker-entrypoint.sh mode change 100644 => 100755 2.8.11/docker-entrypoint.sh mode change 100644 => 100755 2.8.12/docker-entrypoint.sh mode change 100644 => 100755 2.8.13/docker-entrypoint.sh mode change 100644 => 100755 2.8.14/docker-entrypoint.sh mode change 100644 => 100755 2.8.15/docker-entrypoint.sh mode change 100644 => 100755 2.8.16/docker-entrypoint.sh mode change 100644 => 100755 2.8.17/docker-entrypoint.sh mode change 100644 => 100755 2.8.6/docker-entrypoint.sh mode change 100644 => 100755 2.8.7/docker-entrypoint.sh mode change 100644 => 100755 2.8.8/docker-entrypoint.sh mode change 100644 => 100755 2.8.9/docker-entrypoint.sh diff --git a/2.6.17/docker-entrypoint.sh b/2.6.17/docker-entrypoint.sh old mode 100644 new mode 100755 index 6d5b33b37..aec9761b2 --- a/2.6.17/docker-entrypoint.sh +++ b/2.6.17/docker-entrypoint.sh @@ -2,7 +2,7 @@ set -e if [ "$1" = 'redis-server' ]; then - chown -R redis /data + chown -R redis . exec gosu redis "$@" fi diff --git a/2.8.10/docker-entrypoint.sh b/2.8.10/docker-entrypoint.sh old mode 100644 new mode 100755 index 6d5b33b37..aec9761b2 --- a/2.8.10/docker-entrypoint.sh +++ b/2.8.10/docker-entrypoint.sh @@ -2,7 +2,7 @@ set -e if [ "$1" = 'redis-server' ]; then - chown -R redis /data + chown -R redis . exec gosu redis "$@" fi diff --git a/2.8.11/docker-entrypoint.sh b/2.8.11/docker-entrypoint.sh old mode 100644 new mode 100755 index 6d5b33b37..aec9761b2 --- a/2.8.11/docker-entrypoint.sh +++ b/2.8.11/docker-entrypoint.sh @@ -2,7 +2,7 @@ set -e if [ "$1" = 'redis-server' ]; then - chown -R redis /data + chown -R redis . exec gosu redis "$@" fi diff --git a/2.8.12/docker-entrypoint.sh b/2.8.12/docker-entrypoint.sh old mode 100644 new mode 100755 index 6d5b33b37..aec9761b2 --- a/2.8.12/docker-entrypoint.sh +++ b/2.8.12/docker-entrypoint.sh @@ -2,7 +2,7 @@ set -e if [ "$1" = 'redis-server' ]; then - chown -R redis /data + chown -R redis . exec gosu redis "$@" fi diff --git a/2.8.13/docker-entrypoint.sh b/2.8.13/docker-entrypoint.sh old mode 100644 new mode 100755 index 6d5b33b37..aec9761b2 --- a/2.8.13/docker-entrypoint.sh +++ b/2.8.13/docker-entrypoint.sh @@ -2,7 +2,7 @@ set -e if [ "$1" = 'redis-server' ]; then - chown -R redis /data + chown -R redis . exec gosu redis "$@" fi diff --git a/2.8.14/docker-entrypoint.sh b/2.8.14/docker-entrypoint.sh old mode 100644 new mode 100755 index 6d5b33b37..aec9761b2 --- a/2.8.14/docker-entrypoint.sh +++ b/2.8.14/docker-entrypoint.sh @@ -2,7 +2,7 @@ set -e if [ "$1" = 'redis-server' ]; then - chown -R redis /data + chown -R redis . exec gosu redis "$@" fi diff --git a/2.8.15/docker-entrypoint.sh b/2.8.15/docker-entrypoint.sh old mode 100644 new mode 100755 index 6d5b33b37..aec9761b2 --- a/2.8.15/docker-entrypoint.sh +++ b/2.8.15/docker-entrypoint.sh @@ -2,7 +2,7 @@ set -e if [ "$1" = 'redis-server' ]; then - chown -R redis /data + chown -R redis . exec gosu redis "$@" fi diff --git a/2.8.16/docker-entrypoint.sh b/2.8.16/docker-entrypoint.sh old mode 100644 new mode 100755 index 6d5b33b37..aec9761b2 --- a/2.8.16/docker-entrypoint.sh +++ b/2.8.16/docker-entrypoint.sh @@ -2,7 +2,7 @@ set -e if [ "$1" = 'redis-server' ]; then - chown -R redis /data + chown -R redis . exec gosu redis "$@" fi diff --git a/2.8.17/docker-entrypoint.sh b/2.8.17/docker-entrypoint.sh old mode 100644 new mode 100755 index 6d5b33b37..aec9761b2 --- a/2.8.17/docker-entrypoint.sh +++ b/2.8.17/docker-entrypoint.sh @@ -2,7 +2,7 @@ set -e if [ "$1" = 'redis-server' ]; then - chown -R redis /data + chown -R redis . exec gosu redis "$@" fi diff --git a/2.8.6/docker-entrypoint.sh b/2.8.6/docker-entrypoint.sh old mode 100644 new mode 100755 index 6d5b33b37..aec9761b2 --- a/2.8.6/docker-entrypoint.sh +++ b/2.8.6/docker-entrypoint.sh @@ -2,7 +2,7 @@ set -e if [ "$1" = 'redis-server' ]; then - chown -R redis /data + chown -R redis . exec gosu redis "$@" fi diff --git a/2.8.7/docker-entrypoint.sh b/2.8.7/docker-entrypoint.sh old mode 100644 new mode 100755 index 6d5b33b37..aec9761b2 --- a/2.8.7/docker-entrypoint.sh +++ b/2.8.7/docker-entrypoint.sh @@ -2,7 +2,7 @@ set -e if [ "$1" = 'redis-server' ]; then - chown -R redis /data + chown -R redis . exec gosu redis "$@" fi diff --git a/2.8.8/docker-entrypoint.sh b/2.8.8/docker-entrypoint.sh old mode 100644 new mode 100755 index 6d5b33b37..aec9761b2 --- a/2.8.8/docker-entrypoint.sh +++ b/2.8.8/docker-entrypoint.sh @@ -2,7 +2,7 @@ set -e if [ "$1" = 'redis-server' ]; then - chown -R redis /data + chown -R redis . exec gosu redis "$@" fi diff --git a/2.8.9/docker-entrypoint.sh b/2.8.9/docker-entrypoint.sh old mode 100644 new mode 100755 index 6d5b33b37..aec9761b2 --- a/2.8.9/docker-entrypoint.sh +++ b/2.8.9/docker-entrypoint.sh @@ -2,7 +2,7 @@ set -e if [ "$1" = 'redis-server' ]; then - chown -R redis /data + chown -R redis . exec gosu redis "$@" fi