Merge branch 'main' into databranch

kylecarbs · web-flow · commit c8bf12a9ec79 · 2022-02-18T11:09:31.000-06:00
diff --git 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
@@ -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
 
