merge user-changing-work into master

Dockerfile

@@ -15,9 +15,14 @@ RUN ./build.sh -v
 
 FROM alpine:latest
 
-RUN apk add --no-cache mono --repository http://nl.alpinelinux.org/alpine/edge/testing
+RUN apk add --no-cache mono --repository http://nl.alpinelinux.org/alpine/edge/testing && \
+    apk add --no-cache shadow ca-certificates && \
+    cert-sync /etc/ssl/certs/ca-certificates.crt && \
+    apk del ca-certificates
+
 COPY --from=builder /usr/local/src/choco/build_output/chocolatey /opt/chocolatey
 COPY bin/choco /usr/bin/choco
+COPY bin/entrypoint.sh /root/entrypoint.sh
 
-ENTRYPOINT ["/usr/bin/choco"]
+ENTRYPOINT ["/root/entrypoint.sh"]
 CMD ["-h"]

bin/entrypoint.sh

@@ -0,0 +1,22 @@
+#!/bin/sh
+set -e
+
+USER=root
+if [ -n "$UID" ] && [ "$UID" -gt "100" ]; then
+	USER=chocolatey
+	GROUP=chocolatey
+
+	if [ -z "$GID" ] || [ "$GID" -lt "101" ]; then
+		GID=$UID		
+	fi
+	groupadd -g $GID $GROUP
+
+	if [ "$UID" -lt "1000" ]; then
+		useradd -r -N -g $GID -s /bin/sh -u $UID $USER > /dev/null 2>&1
+	else
+		useradd -M -N -e '' -g $GID -s /bin/sh -u $UID $USER > /dev/null 2>&1
+	fi
+fi
+
+command="/usr/bin/choco $@"
+su -c "$command" $USER

example/README.md

@@ -4,10 +4,10 @@ This directory contains an example package and Dockerfile.
 
 ## Generating a new package
 
-The **mypackage** directory was generated using the following command. Note you will need to fix the ownership of these files as they are generated as the root user inside the container.
+The **mypackage** directory was generated using the following command. Note, if you omit `-e UID=$UID` you will need to fix the ownership of these files as they are generated as the root user inside the container.
 
 ```bash
-docker run --rm -v $PWD:$PWD -w $PWD linuturk/mono-choco new mypackage --version 1.0.0 --maintainer "Justin Phelps"
+docker run --rm -e UID=$UID -v $PWD:$PWD -w $PWD linuturk/mono-choco new mypackage --version 1.0.0 --maintainer "Justin Phelps"
 ```
 
 There are some modifications necessary to the generated nuspec file before it will generate a package. Check the file's git history to see those changes.
@@ -18,7 +18,7 @@ I recommend you use the Dockerfile example in this directory to pack your nuget
 
 ```bash
 cd /path/to/mypackage
-docker run --rm -v $PWD:$PWD -w $PWD linuturk/mono-choco pack mypackage.nuspec
+docker run --rm -e UID=$UID -v $PWD:$PWD -w $PWD linuturk/mono-choco pack mypackage.nuspec
 Chocolatey v0.10.9.0
 Directory 'opt/chocolatey/lib' does not exist.