Merge pull request #59 from convox/console3

feat: Add console3 to enterprise
convox · Mar 17, 2023 · 6d15c46 · 6d15c46
2 parents 9df0738 + f679531
commit 6d15c46
Show file tree

Hide file tree

Showing 4 changed files with 125 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -86,6 +86,16 @@ Create a CNAME record for this domain to point at the `Router` attribute shown w
 
     $ convox env set -a console HOST=console.example.org
 
+### Configure New Console environment
+
+For v3 rack
+
+    $ bin/export-env-v3 console | convox env set -a console
+
+For v2 rack
+
+    $ bin/export-env-v2 console | convox env set -a console
+
 ### (OPTIONAL) Internal Mode
 
 To make the Console only accessible inside the VPC, you will need to set Internal mode.

diff --git a/bin/export-env-v2 b/bin/export-env-v2
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+die() {
+  echo $*
+  exit 1
+}
+
+app=$1
+
+[ -z $app ] && die "usage: export-env-v2 <app-name>"
+
+route=$(convox rack | grep Router | awk -F '  +' '{print $2}')
+
+echo "CONSOLE_URL=https://${app}-web.${route}"
+echo "CONSOLE_BETA_URL=https://${app}-console3.${route}"
diff --git a/bin/export-env-v3 b/bin/export-env-v3
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+die() {
+  echo $*
+  exit 1
+}
+
+app=$1
+
+[ -z $app ] && die "usage: export-env-v2 <app-name>"
+
+route=$(convox rack | grep Router | awk -F '  +' '{print $2}' | cut -c8-)
+
+echo "CONSOLE_URL=https://web.${app}.${route}"
+echo "CONSOLE_BETA_URL=https://console3.${app}.${route}"
diff --git a/convox.yml b/convox.yml
@@ -1,7 +1,6 @@
 services:
   web:
     command: bin/web
-    domain: ${HOST}
     environment:
       - AUDIT_LOGS_OBJECT_STORE
       - AUTHENTICATION=
@@ -32,7 +31,7 @@ services:
     health:
       interval: 30
       path: /check
-    image: enterprise.convox.com/console:2.2.11
+    image: enterprise.convox.com/console:2.2.16
     init: true
     internal: ${INTERNAL}
     port: https:3000
@@ -52,7 +51,7 @@ services:
       - RACK_KEY
       - RACK_SYNC_WORKER_QUEUE
       - TABLE_PREFIX
-    image: enterprise.convox.com/console:2.2.11
+    image: enterprise.convox.com/console:2.2.16
     init: true
     scale:
       count: 1
@@ -72,12 +71,94 @@ services:
       - TABLE_PREFIX
       - TUNNEL_HOST=
       - WORKER_QUEUE
-    image: enterprise.convox.com/console:2.2.11
+    image: enterprise.convox.com/console:2.2.16
     init: true
     scale:
       count: 1
       cpu: 128
       memory: 500
+  reverse-proxy:
+    image: enterprise.convox.com/console:2.2.16
+    command: bin/reverse-proxy
+    domain: ${HOST}
+    environment:
+      - APP=console
+      - AUDIT_LOGS_OBJECT_STORE
+      - AUTHENTICATION=
+      - AWS_REGION
+      - AWS_ACCESS_KEY_ID
+      - AWS_SECRET_ACCESS_KEY
+      - CONSOLE_URL
+      - CONSOLE_BETA_URL
+      - GITHUB_CLIENT_ID=
+      - GITHUB_CLIENT_SECRET=
+      - GITHUB_ENTERPRISE_CLIENT_ID=
+      - GITHUB_ENTERPRISE_CLIENT_SECRET=
+      - GITHUB_ENTERPRISE_HOST=
+      - GITHUB_WEBHOOK_SECRET=
+      - GITLAB_CLIENT_ID=
+      - GITLAB_CLIENT_SECRET=
+      - HOST
+      - LDAP_ADDR=
+      - LDAP_BIND=
+      - LDAP_VERIFY=
+      - LICENSE_KEY
+      - RACK_KEY
+      - RACK_SYNC_WORKER_QUEUE
+      - SAML_METADATA=
+      - SESSION_KEY
+      - SLACK_CLIENT_ID=
+      - SLACK_CLIENT_SECRET=
+      - TABLE_PREFIX
+      - WORKER_QUEUE
+    health:
+      interval: 5
+      grace: 0
+      path: /check
+    init: true
+    port: https:3003
+    scale:
+      count: 2
+      cpu: 64
+      memory: 500
+  console3:
+    image: enterprise.convox.com/console:3.0.1
+    command: web
+    environment:
+      - APP=console
+      - AUDIT_LOGS_OBJECT_STORE
+      - AWS_ACCESS_KEY_ID
+      - AWS_REGION
+      - AWS_SECRET_ACCESS_KEY
+      - GITHUB_CLIENT_ID=
+      - GITHUB_CLIENT_SECRET=
+      - GITHUB_ENTERPRISE_CLIENT_ID=
+      - GITHUB_ENTERPRISE_CLIENT_SECRET=
+      - GITHUB_ENTERPRISE_HOST=
+      - GITHUB_WEBHOOK_SECRET=
+      - GITLAB_CLIENT_ID=
+      - GITLAB_CLIENT_SECRET=
+      - LICENSE_KEY
+      - OAUTH_CALLBACK_HOST=${HOST}
+      - RACK_KEY
+      - RACK_SYNC_WORKER_QUEUE
+      - SESSION_KEY
+      - SLACK_CLIENT_ID=
+      - SLACK_CLIENT_SECRET=
+      - TABLE_PREFIX
+      - TUNNEL_HOST=
+      - VUE_APP_ENVIRONMENT=production
+      - VUE_APP_GTM_AUTH=
+      - VUE_APP_GTM_PREVIEW=
+      - VUE_APP_SENTRY_DSN=
+      - VUE_APP_RECAPTCHA_KEY=
+      - WORKER_QUEUE
+    health: /check
+    port: https:3000
+    scale:
+      count: 2
+      cpu: 64
+      memory: 512
 timers:
   rack-status:
     command: task rack-status