From d0789c963119503968c639fadca704714cbc019a Mon Sep 17 00:00:00 2001
From: Kyle Carberry <kyle@coder.com>
Date: Tue, 8 Mar 2022 03:10:33 +0000
Subject: [PATCH] fix: Make deploy use new build scripts

---
 Makefile                |  4 ++--
 images/coder/Dockerfile | 12 ++++--------
 images/coder/run.sh     |  2 +-
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index 8032238308de3..c157c2aed21a1 100644
--- a/Makefile
+++ b/Makefile
@@ -21,8 +21,8 @@ database/generate: fmt/sql database/dump.sql database/query.sql
 .PHONY: database/generate
 
 docker/image/coder: build
-	cp ./images/coder/run.sh ./bin
-	docker build --network=host -t us-docker.pkg.dev/coder-blacktriangle-dev/ci/coder:latest -f images/coder/Dockerfile ./bin
+	cp ./images/coder/run.sh ./dist/coder_$(GOOS)_$(GOARCH)
+	docker build --network=host -t us-docker.pkg.dev/coder-blacktriangle-dev/ci/coder:latest -f images/coder/Dockerfile ./dist/coder_$(GOOS)_$(GOARCH)
 .PHONY: docker/build
 
 fmt/prettier:
diff --git a/images/coder/Dockerfile b/images/coder/Dockerfile
index 65f56e5ea3f61..4c9164b85915a 100644
--- a/images/coder/Dockerfile
+++ b/images/coder/Dockerfile
@@ -4,14 +4,10 @@ RUN yum install -y yum-utils
 RUN yum-config-manager --add-repo https://rpm.releases.hashicorp.com/RHEL/hashicorp.repo
 RUN yum install -y terraform
 
-COPY coderd /coder/coderd
-RUN chmod +x /coder/coderd
+COPY coder /coder
+RUN chmod +x /coder
 
-COPY run.sh /coder/run.sh
-RUN chmod +x /coder/run.sh
-
-# Once `provisionerd` is available, we'll also need that binary
-# COPY bin/provisionerd /provisionerd
-# RUN chmod +x /provisionerd
+COPY run.sh /run.sh
+RUN chmod +x /run.sh
 
 ENTRYPOINT ["/coder/run.sh"]
diff --git a/images/coder/run.sh b/images/coder/run.sh
index eb04622165c1d..4e5193657accb 100755
--- a/images/coder/run.sh
+++ b/images/coder/run.sh
@@ -26,5 +26,5 @@ function create_initial_user() {
 (
   trap 'kill 0' SIGINT
   create_initial_user &
-  /coder/coderd --address=":$PORT"
+  /coder daemon --address=":$PORT"
 )