From 61704210442b5b2ec2dd97d75aca6c819387af89 Mon Sep 17 00:00:00 2001
From: Bryan <bryan@coder.com>
Date: Fri, 18 Feb 2022 09:07:28 -0800
Subject: [PATCH] fix: Install terraform in Docker image to unblock deploy
 (#319)

Fixes #287 and re-enables our deploy at https://proto.cdr.dev

- Installs `terraform` in our `images/coder/Dockerfile`
- Re-enables our `deploy` GH action

Example of successful deploy run: https://github.com/coder/coder/runs/5241614008?check_suite_focus=true
---
 .github/workflows/coder.yaml | 7 +------
 images/coder/Dockerfile      | 4 ++++
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/coder.yaml b/.github/workflows/coder.yaml
index c9f122aaad..f75fee6d7a 100644
--- a/.github/workflows/coder.yaml
+++ b/.github/workflows/coder.yaml
@@ -187,12 +187,7 @@ jobs:
   deploy:
     name: "deploy"
     runs-on: ubuntu-latest
-    # Temporarily disable the 'deploy' job until issue is fixed:
-    # https://github.com/coder/coder/issues/287
-    # As a part of a fix for that, uncomment the below line
-    # and delete the 'if' after:
-    # if: github.event_name != 'pull_request'
-    if: false
+    if: github.event_name != 'pull_request'
     permissions:
       contents: read
       id-token: write
diff --git a/images/coder/Dockerfile b/images/coder/Dockerfile
index 382ca7e195..65f56e5ea3 100644
--- a/images/coder/Dockerfile
+++ b/images/coder/Dockerfile
@@ -1,5 +1,9 @@
 FROM registry.access.redhat.com/ubi8/ubi:latest
 
+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