From 92526dc8b1bc227444833b57f0fb0f5ee093a02f Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Fri, 23 May 2014 14:28:32 -0600 Subject: [PATCH 1/2] Add specific branch of jpetazzo's busybox to clone from so we can assume nice things about it Docker-DCO-1.1-Signed-off-by: Andrew Page (github: tianon) Upstream-commit: efa79a09a92b41b07d0aee3c728d98eec5120730 Component: engine --- components/engine/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/engine/Dockerfile b/components/engine/Dockerfile index 41f0f92947..dd8ccfd1f9 100644 --- a/components/engine/Dockerfile +++ b/components/engine/Dockerfile @@ -81,7 +81,7 @@ RUN go get code.google.com/p/go.tools/cmd/cover RUN gem install --no-rdoc --no-ri fpm --version 1.0.2 # Get the "busybox" image source so we can build locally instead of pulling -RUN git clone https://github.com/jpetazzo/docker-busybox.git /docker-busybox +RUN git clone -b buildroot-2014.02 https://github.com/jpetazzo/docker-busybox.git /docker-busybox # Setup s3cmd config RUN /bin/echo -e '[default]\naccess_key=$AWS_ACCESS_KEY\nsecret_key=$AWS_SECRET_KEY' > /.s3cfg From 19aaa7241bdac65fa79bb71cc9d3d0963d7c89ad Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Fri, 23 May 2014 14:29:31 -0600 Subject: [PATCH 2/2] Simplify "adduser" in the Dockerfile to use the more scripting-friendly "useradd" Docker-DCO-1.1-Signed-off-by: Andrew Page (github: tianon) Upstream-commit: 886d3c939687672c6589120229c05435273b7d59 Component: engine --- components/engine/Dockerfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/components/engine/Dockerfile b/components/engine/Dockerfile index dd8ccfd1f9..283e0a3262 100644 --- a/components/engine/Dockerfile +++ b/components/engine/Dockerfile @@ -90,9 +90,8 @@ RUN /bin/echo -e '[default]\naccess_key=$AWS_ACCESS_KEY\nsecret_key=$AWS_SECRET_ RUN git config --global user.email 'docker-dummy@example.com' # Add an unprivileged user to be used for tests which need it -RUN adduser unprivilegeduser -RUN groupadd docker -RUN gpasswd -a unprivilegeduser docker +RUN groupadd -r docker +RUN useradd --create-home --gid docker unprivilegeduser VOLUME /var/lib/docker WORKDIR /go/src/github.com/dotcloud/docker