PR feedback - fix Dockerfile run commands and runner bash exec

dougnukem · dougnukem · commit 1bb64e54b5da · 2020-03-17T12:47:38.000-05:00
diff --git a/.sail/Dockerfile b/.sail/Dockerfile
@@ -14,7 +14,3 @@ LABEL project_root "~/go/src/go.coder.com"
 RUN wget -O /tmp/hugo.deb https://github.com/gohugoio/hugo/releases/download/v0.55.4/hugo_extended_0.55.4_Linux-64bit.deb && \
   sudo dpkg -i /tmp/hugo.deb && \
   rm -f /tmp/hugo.deb
-
-# Fails to install Extension 'ms-azuretools.vscode-docker' not found.
-#    error vscode undefined
-# RUN installext ms-azuretools.vscode-docker
diff --git a/images/base/Dockerfile b/images/base/Dockerfile
@@ -24,14 +24,11 @@ ENV LC_ALL=en_US.UTF-8
 # anyways, but it's nice to have this during the build pipepline so we can
 # install extensions.
 
-# Download and Install code-server: https://github.com/cdr/code-server/releases/tag/3.0.0
-
-RUN wget -O code-server.tgz "https://codesrv-ci.cdr.sh/releases/3.0.1/linux-x86_64.tar.gz"; \
-	tar -C /usr/lib -xzf code-server.tgz; \
-	rm code-server.tgz;
-
-RUN ln -s /usr/lib/code-server-3.0.1-linux-x86_64/code-server /usr/bin/code-server; \
-    chmod +x /usr/lib/code-server-3.0.1-linux-x86_64/code-server; \
-    chmod +x /usr/bin/code-server;
+RUN wget -O code-server.tgz "https://codesrv-ci.cdr.sh/releases/3.0.1/linux-x86_64.tar.gz" && \
+	tar -C /usr/lib -xzf code-server.tgz && \
+	rm code-server.tgz && \
+    ln -s /usr/lib/code-server-3.0.1-linux-x86_64/code-server /usr/bin/code-server && \
+    chmod +x /usr/lib/code-server-3.0.1-linux-x86_64/code-server && \
+    chmod +x /usr/bin/code-server
 
 ADD installext /usr/bin/installext
diff --git a/runner.go b/runner.go
@@ -165,13 +165,13 @@ func (r *runner) constructCommand(projectDir string) string {
 	//
 	// We start code-server such that extensions installed through the UI are placed in the host's extension dir.
 	cmd := fmt.Sprintf(`set -euxo pipefail || exit 1
-	cd %v
-	# This is necessary in case the .vscode directory wasn't created inside the container, as mounting to the host
-	# extension dir will create it as root.
-	sudo chown user:user ~/.vscode
-	/usr/bin/code-server --host %v --port %v --user-data-dir ~/.config/Code --extensions-dir %v --extra-extensions-dir ~/.vscode/extensions --auth=none \
-	--allow-http 2>&1 | tee %v
-	`, projectDir, containerAddr, containerPort, hostExtensionsDir, containerLogPath)
+cd %v
+# This is necessary in case the .vscode directory wasn't created inside the container, as mounting to the host
+# extension dir will create it as root.
+sudo chown user:user ~/.vscode
+/usr/bin/code-server --host %v --port %v --user-data-dir ~/.config/Code --extensions-dir %v --extra-extensions-dir ~/.vscode/extensions --auth=none \
+--allow-http 2>&1 | tee %v`,
+		projectDir, containerAddr, containerPort, hostExtensionsDir, containerLogPath)
 
 	if r.testCmd != "" {
 		cmd = r.testCmd + "\n exit 1"
