Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/workflows/deploy-to-production.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,14 @@ jobs:
cd optimism
echo ${{ secrets.EMAIL_USER }} > email_user
echo ${{ secrets.EMAIL_PASS }} > email_pass
echo ${{ secrets.ADMIN_USERNAME }} > admin_user
echo ${{ secrets.ADMIN_PASSWORD }} > admin_pass
git pull
docker compose build --build-arg OPTIMISM_API_CLIENT_SIDE_URL=${{ secrets.API_BASE_URL }} --build-arg OPTIMISM_WEBSITE_BASE_URL=${{ secrets.WEBSITE_BASE_URL }} --build-arg OPTIMISM_EMAIL_ORG_FROM_ADDR='${{ secrets.EMAIL_ORG_FROM_ADDR }}' --build-arg OPTIMISM_EMAIL_ORG_NOTIFY_ADDR='${{ secrets.EMAIL_ORG_NOTIFY_ADDR }}' --build-arg OPTIMISM_SMTP_HOST=${{ secrets.SMTP_HOST }} --build-arg OPTIMISM_SMTP_PORT=${{ secrets.SMTP_PORT }} --build-arg OPTIMISM_SMTP_SECURE=${{ secrets.SMTP_SECURE }}
docker compose down
docker compose up -d
docker compose exec api npx knex migrate:latest --env production
rm email_user
rm email_pass
rm admin_user
rm admin_pass
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,6 @@ node_modules/
out/
.idea/
email_pass
email_user
email_user
admin_pass
admin_user
7 changes: 7 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,17 @@ services:
- 127.0.0.1:3000:3000
links:
- api
secrets:
- admin_user
- admin_pass
restart: always
secrets:
email_user:
file: email_user
email_pass:
file: email_pass
admin_user:
file: admin_user
admin_pass:
file: admin_pass

12 changes: 12 additions & 0 deletions website/settings.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
const fs = require('fs');

require('dotenv').config();

const admin_user_path = "/run/secrets/admin_user";
const admin_pass_path = "/run/secrets/admin_pass";
if (fs.existsSync(admin_user_path))
{
process.env.OPTIMISM_ADMIN_USERNAME = fs.readFileSync(admin_user_path, { encoding: 'utf8' }).trim();
}
if (fs.existsSync(admin_pass_path))
{
process.env.OPTIMISM_ADMIN_PASSWORD = fs.readFileSync(admin_pass_path, { encoding: 'utf8' }).trim();
}
const settings = {
port: process.env.OPTIMISM_WEBSITE_PORT || 3000,
apiUrl: process.env.OPTIMISM_API_URL || 'http://optimism_api:3001/api',
Expand Down
Loading