From 0c9603708c7c1deba1680cb276be718ea68b7a3e Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Mon, 11 Jul 2016 14:31:25 +0100 Subject: [PATCH 1/2] remove syslog fix, as now upstream Signed-off-by: Justin Cormack --- alpine/Dockerfile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index a2a4956de..5ffbc197d 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -115,10 +115,6 @@ RUN \ rc-update add test default && \ true -# we do not need to restart syslog, as probably not running -RUN \ - sed -i 's@/etc/init.d/syslog --quiet restart@@' /sbin/setup-disk - COPY init / CMD ["/bin/sh"] From 7fb90b6af5d4583e6ccaafe0e07b158826da5ba6 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Mon, 11 Jul 2016 14:47:23 +0100 Subject: [PATCH 2/2] Fix user namespace support fix #153 For now, just create the default remap user, rather than trying to fix the command emulation. The existing code in docker is not ideal, as it is GNU specific, try to find a better option for 1.13. Signed-off-by: Justin Cormack --- alpine/Dockerfile | 4 ++-- alpine/packages/userns/groupadd | 3 --- alpine/packages/userns/useradd | 13 ------------- 3 files changed, 2 insertions(+), 18 deletions(-) delete mode 100755 alpine/packages/userns/groupadd delete mode 100755 alpine/packages/userns/useradd diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 5ffbc197d..b420df3de 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -64,8 +64,6 @@ COPY packages/hvtools/hv_set_ifconfig /sbin/ COPY packages/hvtools/hvtools.tar.gz /usr/share/src/ COPY packages/chronyd/etc /etc/ COPY packages/userns/etc /etc/ -COPY packages/userns/groupadd /usr/sbin -COPY packages/userns/useradd /usr/sbin #COPY packages/nc-vsock/nc-vsock /usr/bin COPY packages/vsudd/vsudd /sbin COPY packages/vsudd/etc /etc @@ -117,4 +115,6 @@ RUN \ COPY init / +RUN adduser -D -H -s /sbin/nologin dockremap + CMD ["/bin/sh"] diff --git a/alpine/packages/userns/groupadd b/alpine/packages/userns/groupadd deleted file mode 100755 index 3e12d0ef5..000000000 --- a/alpine/packages/userns/groupadd +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -exec /usr/sbin/addgroup $@ diff --git a/alpine/packages/userns/useradd b/alpine/packages/userns/useradd deleted file mode 100755 index fff2a130c..000000000 --- a/alpine/packages/userns/useradd +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -for a in $* -do - [ "$a" = "-N" ] && a="" - [ "$a" = "-M" ] && a="-H" - [ "$a" = "-g" ] && a="-G" - args="$args $a" -done - -echo $args - -exec /usr/sbin/adduser -D ${args}