Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Companion deploys #3388

Merged
merged 10 commits into from
Jan 10, 2022
Merged

Fix Companion deploys #3388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1cc1c38
Change compilation to postinstall
kiloreux Dec 22, 2021
5cee518
Deploy
kiloreux Dec 22, 2021
e4f7659
Restore shape
kiloreux Dec 22, 2021
315306c
Reduce builds
kiloreux Dec 22, 2021
7c857c5
Use docker instead
kiloreux Jan 9, 2022
71be310
Use port as second variable
kiloreux Jan 9, 2022
6069539
Merge branch 'main' into companion-docker
kiloreux Jan 9, 2022
fa9c616
Change
kiloreux Jan 9, 2022
d20b0ae
Minor fixes
kiloreux Jan 9, 2022
a15f2be
Update .github/workflows/companion-deploy.yml
kiloreux Jan 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion .github/workflows/companion-deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
name: Companion Deploy


on:
push:
branches: [main]
Expand Down Expand Up @@ -43,10 +44,13 @@ jobs:
steps:
- name: Checkout sources
uses: actions/checkout@v2
- name: Alter dockerfile
run: |
sed -i 's/^EXPOSE 3020$/EXPOSE $PORT/g' Dockerfile
- name: Deploy to heroku
uses: akhileshns/heroku-deploy@v3.12.12
with:
appdir: packages/@uppy/companion
heroku_api_key: ${{secrets.HEROKU_API_KEY}}
heroku_app_name: companion-demo
heroku_email: ${{secrets.HEROKU_EMAIL}}
usedocker: true
1 change: 0 additions & 1 deletion packages/@uppy/companion/Procfile
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions packages/@uppy/companion/heroku.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
build:
docker:
web: Dockerfile
2 changes: 1 addition & 1 deletion packages/@uppy/companion/src/standalone/start-server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ const companion = require('../companion')
const { version } = require('../../package.json')
const standalone = require('.')

const port = process.env.COMPANION_PORT || 3020
const port = process.env.COMPANION_PORT || process.env.PORT || 3020

const { app } = standalone()

Expand Down