From b5e0a66383c927ba70ced06ae821be278e95178f Mon Sep 17 00:00:00 2001
From: Hikari <enra@sayonika.moe>
Date: Tue, 12 Mar 2019 02:55:11 +0000
Subject: [PATCH 1/2] feat: user-mode docker

Signed-off-by: Hikari <enra@sayonika.moe>
---
 Dockerfile | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index dbe5613767ef..04b0c454e6a4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,16 +17,28 @@ RUN yarn && yarn task build:server:binary
 
 # We deploy with ubuntu so that devs have a familiar environment.
 FROM ubuntu:18.10
-WORKDIR /root/project
-COPY --from=0 /src/packages/server/cli-linux-x64 /usr/local/bin/code-server
-EXPOSE 8443
-RUN apt-get update && apt-get install -y \
-	openssl \
-	net-tools
-RUN apt-get install -y locales && \
-	locale-gen en_US.UTF-8
+
 # We unfortunately cannot use update-locale because docker will not use the env variables
 # configured in /etc/default/locale so we need to set it manually.
 ENV LANG=en_US.UTF-8
+
+COPY --from=0 /src/packages/server/cli-linux-x64 /usr/local/bin/code-server
+RUN apt-get update && apt-get install -y \
+    sudo \
+	openssl \
+	locales \
+	net-tools && \
+	adduser --disabled-password --ingroup sudo --gecos '' coder && \
+    echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers && \
+    echo "user ALL=(root) NOPASSWD:ALL" > /etc/sudoers.d/user && \
+    chmod 0440 /etc/sudoers.d/user;
+
+RUN locale-gen en_US.UTF-8
+
+USER coder
+
+WORKDIR /home/coder
+
+EXPOSE 8443
 ENTRYPOINT code-server
 CMD ["."]

From 559e3295b2b237caa017cf49ab160430425ecf64 Mon Sep 17 00:00:00 2001
From: Hikari Kibo <enra@sayonika.moe>
Date: Wed, 20 Mar 2019 23:24:18 +0800
Subject: [PATCH 2/2] fix: slap adduser into another RUN

im abusing the word slap today please help me
---
 Dockerfile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 887952ac63df..0cd64ad6c724 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -26,8 +26,9 @@ RUN apt-get update && apt-get install -y \
     sudo \
 	openssl \
 	locales \
-	net-tools && \
-	adduser --disabled-password --ingroup sudo --gecos '' coder && \
+	net-tools;
+	
+RUN adduser --disabled-password --ingroup sudo --gecos '' coder && \
     echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers && \
     echo "user ALL=(root) NOPASSWD:ALL" > /etc/sudoers.d/user && \
     chmod 0440 /etc/sudoers.d/user;
@@ -39,4 +40,4 @@ USER coder
 WORKDIR /home/coder
 
 EXPOSE 8443
-ENTRYPOINT ["code-server"]
\ No newline at end of file
+ENTRYPOINT ["code-server"]