Browse Source

Fix Companion deploys (#3388)

* Change compilation to postinstall

* Deploy

* Restore shape

* Reduce builds

* Use docker instead

* Use port as second variable

* Change

* Minor fixes

* Update .github/workflows/companion-deploy.yml

Co-authored-by: Mikael Finstad <finstaden@gmail.com>

Co-authored-by: Mikael Finstad <finstaden@gmail.com>
kiloreux 3 years ago
parent
commit
fee5ad917f

+ 5 - 1
.github/workflows/companion-deploy.yml

@@ -1,5 +1,6 @@
 name: Companion Deploy
 name: Companion Deploy
 
 
+
 on:
 on:
   push:
   push:
     branches: [main]
     branches: [main]
@@ -43,10 +44,13 @@ jobs:
     steps:
     steps:
       - name: Checkout sources
       - name: Checkout sources
         uses: actions/checkout@v2
         uses: actions/checkout@v2
+      - name: Alter dockerfile
+        run: |
+          sed -i 's/^EXPOSE 3020$/EXPOSE $PORT/g' Dockerfile
       - name: Deploy to heroku
       - name: Deploy to heroku
         uses: akhileshns/heroku-deploy@v3.12.12
         uses: akhileshns/heroku-deploy@v3.12.12
         with:
         with:
-          appdir: packages/@uppy/companion
           heroku_api_key: ${{secrets.HEROKU_API_KEY}}
           heroku_api_key: ${{secrets.HEROKU_API_KEY}}
           heroku_app_name: companion-demo
           heroku_app_name: companion-demo
           heroku_email: ${{secrets.HEROKU_EMAIL}}
           heroku_email: ${{secrets.HEROKU_EMAIL}}
+          usedocker: true

+ 0 - 1
packages/@uppy/companion/Procfile

@@ -1 +0,0 @@
-web: COMPANION_PORT=$PORT node ./src/standalone/start-server

+ 3 - 0
packages/@uppy/companion/heroku.yml

@@ -0,0 +1,3 @@
+build:
+  docker:
+    web: Dockerfile

+ 1 - 1
packages/@uppy/companion/src/standalone/start-server.js

@@ -4,7 +4,7 @@ const companion = require('../companion')
 const { version } = require('../../package.json')
 const { version } = require('../../package.json')
 const standalone = require('.')
 const standalone = require('.')
 
 
-const port = process.env.COMPANION_PORT || 3020
+const port = process.env.COMPANION_PORT || process.env.PORT || 3020
 
 
 const { app } = standalone()
 const { app } = standalone()