From 3aff1127b5ccdb4208ef7a8c8215887df67e315b Mon Sep 17 00:00:00 2001
From: Mathias Fredriksson <mafredri@gmail.com>
Date: Wed, 9 Nov 2022 14:27:53 +0000
Subject: [PATCH 1/2] fix: Improve docker example first user experience

The base ubuntu image lands the user as root, but the terraform tempalte
expected /home/coder to be used. This change adds a user with the same
name as the Coder users username and allows them to sudo.
---
 examples/templates/docker/build/Dockerfile | 16 +++++++++++++++-
 examples/templates/docker/main.tf          | 11 +++++++++--
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/examples/templates/docker/build/Dockerfile b/examples/templates/docker/build/Dockerfile
index fc429d5a2bce9..92d8cd3339a3e 100644
--- a/examples/templates/docker/build/Dockerfile
+++ b/examples/templates/docker/build/Dockerfile
@@ -1,3 +1,17 @@
 FROM ubuntu
 
-RUN apt-get update && apt-get install -y curl wget git vim golang
+RUN apt-get update \
+	&& apt-get install -y \
+	curl \
+	git \
+	golang \
+	sudo \
+	vim \
+	wget
+
+ARG USER=coder
+RUN useradd --groups sudo --no-create-home ${USER} \
+	&& echo "${USER} ALL=(ALL) NOPASSWD:ALL" >/etc/sudoers.d/${USER} \
+	&& chmod 0440 /etc/sudoers.d/${USER}
+USER ${USER}
+WORKDIR /home/${USER}
diff --git a/examples/templates/docker/main.tf b/examples/templates/docker/main.tf
index 1e68f093b9d28..f465aeddb5318 100644
--- a/examples/templates/docker/main.tf
+++ b/examples/templates/docker/main.tf
@@ -11,6 +11,10 @@ terraform {
   }
 }
 
+locals {
+  username = data.coder_workspace.me.owner
+}
+
 data "coder_provisioner" "me" {
 }
 
@@ -46,7 +50,7 @@ resource "coder_app" "code-server" {
   agent_id     = coder_agent.main.id
   slug         = "code-server"
   display_name = "code-server"
-  url          = "http://localhost:13337/?folder=/home/coder"
+  url          = "http://localhost:13337/?folder=/home/${local.username}"
   icon         = "/icon/code.svg"
   subdomain    = false
   share        = "owner"
@@ -91,6 +95,9 @@ resource "docker_image" "main" {
   name = "coder-${data.coder_workspace.me.id}"
   build {
     path = "./build"
+    build_arg = {
+      USER = local.username
+    }
   }
   triggers = {
     dir_sha1 = sha1(join("", [for f in fileset(path.module, "build/*") : filesha1(f)]))
@@ -112,7 +119,7 @@ resource "docker_container" "workspace" {
     ip   = "host-gateway"
   }
   volumes {
-    container_path = "/home/coder/"
+    container_path = "/home/${local.username}"
     volume_name    = docker_volume.home_volume.name
     read_only      = false
   }

From c4dad74bd3c6914464981e57b8c9efc16fbaf096 Mon Sep 17 00:00:00 2001
From: Mathias Fredriksson <mafredri@gmail.com>
Date: Wed, 9 Nov 2022 16:24:22 +0000
Subject: [PATCH 2/2] Clean up apt lists

---
 examples/templates/docker/build/Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/examples/templates/docker/build/Dockerfile b/examples/templates/docker/build/Dockerfile
index 92d8cd3339a3e..29d3bf7cf0236 100644
--- a/examples/templates/docker/build/Dockerfile
+++ b/examples/templates/docker/build/Dockerfile
@@ -7,7 +7,8 @@ RUN apt-get update \
 	golang \
 	sudo \
 	vim \
-	wget
+	wget \
+	&& rm -rf /var/lib/apt/lists/*
 
 ARG USER=coder
 RUN useradd --groups sudo --no-create-home ${USER} \