From ec196b2850e31906ce995f1dfdafaf084d327090 Mon Sep 17 00:00:00 2001 From: SrJuggernaut Date: Wed, 31 Jul 2024 18:35:29 -0600 Subject: [PATCH] fix: deploy --- .env.example | 7 ++----- .github/workflows/deploy-preview.yml | 21 +++++++++++++-------- .github/workflows/deploy-production.yml | 23 ++++++++++++++--------- .github/workflows/setup-preview.yml | 17 +++++++++++------ .github/workflows/setup-production.yml | 19 ++++++++++++------- ecosystem.config.js | 23 ++++++++++++++++++----- 6 files changed, 70 insertions(+), 40 deletions(-) diff --git a/.env.example b/.env.example index 898b932..abe9a4a 100644 --- a/.env.example +++ b/.env.example @@ -1,7 +1,3 @@ -# App variables - -SITE_NAME="EntGamers" - # Deployment variables APP_NAME="" @@ -15,7 +11,7 @@ DEPLOY_PATH="" SSH_PRIVATE_KEY="" SSH_KNOWN_HOSTS="" -# Appwrite required variables +# Appwrite required variables NEXT_PUBLIC_APPWRITE_ENDPOINT="" NEXT_PUBLIC_APPWRITE_PROJECT_ID="" @@ -23,5 +19,6 @@ APPWRITE_API_KEY="" # Website Variables +SITE_NAME="EntGamers" NEXT_PUBLIC_SITE_URL="https://entgamers.com" IMAGE_DOMAINS="https://domain.com,http://another.domain.com/route/" \ No newline at end of file diff --git a/.github/workflows/deploy-preview.yml b/.github/workflows/deploy-preview.yml index 8ff1750..3a068eb 100644 --- a/.github/workflows/deploy-preview.yml +++ b/.github/workflows/deploy-preview.yml @@ -9,8 +9,8 @@ jobs: runs-on: ubuntu-latest environment: preview steps: - - uses: actions/checkout@v3 - - uses: oven-sh/setup-bun@v1 + - uses: actions/checkout@v4 + - uses: oven-sh/setup-bun@v2 - uses: kielabokkie/ssh-key-and-known-hosts-action@v1 with: ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }} @@ -22,12 +22,17 @@ jobs: run: pm2 deploy ecosystem.config.js preview env: # Deploy environment variables - DEPLOY_HOST: ${{ secrets.DEPLOY_HOST }} - SSH_USERNAME: ${{ secrets.SSH_USERNAME }} - DEPLOY_PATH: ${{ secrets.DEPLOY_PATH }} - # App environment variables APP_NAME: ${{ secrets.APP_NAME }} - SITE_NAME: ${{ secrets.SITE_NAME }} PORT: ${{ secrets.PORT }} - DISCORD_JOIN_WEBHOOK_URL: ${{ secrets.DISCORD_JOIN_WEBHOOK_URL }} + SSH_USERNAME: ${{ secrets.SSH_USERNAME }} + DEPLOY_HOST: ${{ secrets.DEPLOY_HOST }} + DEPLOY_PATH: ${{ secrets.DEPLOY_PATH }} + # Appwrite variables + NEXT_PUBLIC_APPWRITE_ENDPOINT: ${{ secrets.NEXT_PUBLIC_APPWRITE_ENDPOINT }} + NEXT_PUBLIC_APPWRITE_PROJECT_ID: ${{ secrets.NEXT_PUBLIC_APPWRITE_PROJECT_ID }} + APPWRITE_API_KEY: ${{ secrets.APPWRITE_API_KEY }} + # Website variables + SITE_NAME: ${{ secrets.SITE_NAME }} + NEXT_PUBLIC_SITE_URL: ${{ secrets.NEXT_PUBLIC_SITE_URL }} + IMAGE_DOMAINS: ${{ secrets.IMAGE_DOMAINS }} shell: bash diff --git a/.github/workflows/deploy-production.yml b/.github/workflows/deploy-production.yml index 2c8b6c6..55f6b63 100644 --- a/.github/workflows/deploy-production.yml +++ b/.github/workflows/deploy-production.yml @@ -9,8 +9,8 @@ jobs: runs-on: ubuntu-latest environment: production steps: - - uses: actions/checkout@v3 - - uses: oven-sh/setup-bun@v1 + - uses: actions/checkout@v4 + - uses: oven-sh/setup-bun@v2 - uses: kielabokkie/ssh-key-and-known-hosts-action@v1 with: ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }} @@ -21,13 +21,18 @@ jobs: - name: Deploy using pm2 run: pm2 deploy ecosystem.config.js production env: - # Deploy environment variables - DEPLOY_HOST: ${{ secrets.DEPLOY_HOST }} - SSH_USERNAME: ${{ secrets.SSH_USERNAME }} - DEPLOY_PATH: ${{ secrets.DEPLOY_PATH }} - # App environment variables + # Deploy environment variables APP_NAME: ${{ secrets.APP_NAME }} - SITE_NAME: ${{ secrets.SITE_NAME }} PORT: ${{ secrets.PORT }} - DISCORD_JOIN_WEBHOOK_URL: ${{ secrets.DISCORD_JOIN_WEBHOOK_URL }} + SSH_USERNAME: ${{ secrets.SSH_USERNAME }} + DEPLOY_HOST: ${{ secrets.DEPLOY_HOST }} + DEPLOY_PATH: ${{ secrets.DEPLOY_PATH }} + # Appwrite variables + NEXT_PUBLIC_APPWRITE_ENDPOINT: ${{ secrets.NEXT_PUBLIC_APPWRITE_ENDPOINT }} + NEXT_PUBLIC_APPWRITE_PROJECT_ID: ${{ secrets.NEXT_PUBLIC_APPWRITE_PROJECT_ID }} + APPWRITE_API_KEY: ${{ secrets.APPWRITE_API_KEY }} + # Website variables + SITE_NAME: ${{ secrets.SITE_NAME }} + NEXT_PUBLIC_SITE_URL: ${{ secrets.NEXT_PUBLIC_SITE_URL }} + IMAGE_DOMAINS: ${{ secrets.IMAGE_DOMAINS }} shell: bash diff --git a/.github/workflows/setup-preview.yml b/.github/workflows/setup-preview.yml index fcda9f8..aa91af6 100644 --- a/.github/workflows/setup-preview.yml +++ b/.github/workflows/setup-preview.yml @@ -20,12 +20,17 @@ jobs: run: pm2 deploy ecosystem.config.js preview setup env: # Deploy environment variables - DEPLOY_HOST: ${{ secrets.DEPLOY_HOST }} - SSH_USERNAME: ${{ secrets.SSH_USERNAME }} - DEPLOY_PATH: ${{ secrets.DEPLOY_PATH }} - # App environment variables APP_NAME: ${{ secrets.APP_NAME }} - SITE_NAME: ${{ secrets.SITE_NAME }} PORT: ${{ secrets.PORT }} - DISCORD_JOIN_WEBHOOK_URL: ${{ secrets.DISCORD_JOIN_WEBHOOK_URL }} + SSH_USERNAME: ${{ secrets.SSH_USERNAME }} + DEPLOY_HOST: ${{ secrets.DEPLOY_HOST }} + DEPLOY_PATH: ${{ secrets.DEPLOY_PATH }} + # Appwrite variables + NEXT_PUBLIC_APPWRITE_ENDPOINT: ${{ secrets.NEXT_PUBLIC_APPWRITE_ENDPOINT }} + NEXT_PUBLIC_APPWRITE_PROJECT_ID: ${{ secrets.NEXT_PUBLIC_APPWRITE_PROJECT_ID }} + APPWRITE_API_KEY: ${{ secrets.APPWRITE_API_KEY }} + # Website variables + SITE_NAME: ${{ secrets.SITE_NAME }} + NEXT_PUBLIC_SITE_URL: ${{ secrets.NEXT_PUBLIC_SITE_URL }} + IMAGE_DOMAINS: ${{ secrets.IMAGE_DOMAINS }} shell: bash diff --git a/.github/workflows/setup-production.yml b/.github/workflows/setup-production.yml index 125176b..56a65d9 100644 --- a/.github/workflows/setup-production.yml +++ b/.github/workflows/setup-production.yml @@ -19,13 +19,18 @@ jobs: - name: Deploy using pm2 run: pm2 deploy ecosystem.config.js production setup env: - # Deploy environment variables - DEPLOY_HOST: ${{ secrets.DEPLOY_HOST }} - SSH_USERNAME: ${{ secrets.SSH_USERNAME }} - DEPLOY_PATH: ${{ secrets.DEPLOY_PATH }} - # App environment variables + # Deploy environment variables APP_NAME: ${{ secrets.APP_NAME }} - SITE_NAME: ${{ secrets.SITE_NAME }} PORT: ${{ secrets.PORT }} - DISCORD_JOIN_WEBHOOK_URL: ${{ secrets.DISCORD_JOIN_WEBHOOK_URL }} + SSH_USERNAME: ${{ secrets.SSH_USERNAME }} + DEPLOY_HOST: ${{ secrets.DEPLOY_HOST }} + DEPLOY_PATH: ${{ secrets.DEPLOY_PATH }} + # Appwrite variables + NEXT_PUBLIC_APPWRITE_ENDPOINT: ${{ secrets.NEXT_PUBLIC_APPWRITE_ENDPOINT }} + NEXT_PUBLIC_APPWRITE_PROJECT_ID: ${{ secrets.NEXT_PUBLIC_APPWRITE_PROJECT_ID }} + APPWRITE_API_KEY: ${{ secrets.APPWRITE_API_KEY }} + # Website variables + SITE_NAME: ${{ secrets.SITE_NAME }} + NEXT_PUBLIC_SITE_URL: ${{ secrets.NEXT_PUBLIC_SITE_URL }} + IMAGE_DOMAINS: ${{ secrets.IMAGE_DOMAINS }} shell: bash diff --git a/ecosystem.config.js b/ecosystem.config.js index 2e94207..98f59ab 100644 --- a/ecosystem.config.js +++ b/ecosystem.config.js @@ -7,7 +7,12 @@ module.exports = { env: { NODE_ENV: 'production', PORT: process.env.PORT || 3000, - DISCORD_JOIN_WEBHOOK_URL: process.env.DISCORD_JOIN_WEBHOOK_URL + NEXT_PUBLIC_APPWRITE_ENDPOINT: process.env.NEXT_PUBLIC_APPWRITE_ENDPOINT, + NEXT_PUBLIC_APPWRITE_PROJECT_ID: process.env.NEXT_PUBLIC_APPWRITE_PROJECT_ID, + APPWRITE_API_KEY: process.env.APPWRITE_API_KEY, + SITE_NAME: process.env.SITE_NAME, + NEXT_PUBLIC_SITE_URL: process.env.NEXT_PUBLIC_SITE_URL, + IMAGE_DOMAINS: process.env.IMAGE_DOMAINS } } ], @@ -21,9 +26,13 @@ module.exports = { path: process.env.DEPLOY_PATH, 'post-deploy': 'pm2 --silent startOrRestart ecosystem.config.js', env: { - APP_NAME: process.env.APP_NAME, PORT: process.env.PORT, - DISCORD_JOIN_WEBHOOK_URL: process.env.DISCORD_JOIN_WEBHOOK_URL + NEXT_PUBLIC_APPWRITE_ENDPOINT: process.env.NEXT_PUBLIC_APPWRITE_ENDPOINT, + NEXT_PUBLIC_APPWRITE_PROJECT_ID: process.env.NEXT_PUBLIC_APPWRITE_PROJECT_ID, + APPWRITE_API_KEY: process.env.APPWRITE_API_KEY, + SITE_NAME: process.env.SITE_NAME, + NEXT_PUBLIC_SITE_URL: process.env.NEXT_PUBLIC_SITE_URL, + IMAGE_DOMAINS: process.env.IMAGE_DOMAINS } }, @@ -35,9 +44,13 @@ module.exports = { path: process.env.DEPLOY_PATH, 'post-deploy': 'pm2 --silent startOrRestart ecosystem.config.js', env: { - APP_NAME: process.env.APP_NAME, PORT: process.env.PORT, - DISCORD_JOIN_WEBHOOK_URL: process.env.DISCORD_JOIN_WEBHOOK_URL + NEXT_PUBLIC_APPWRITE_ENDPOINT: process.env.NEXT_PUBLIC_APPWRITE_ENDPOINT, + NEXT_PUBLIC_APPWRITE_PROJECT_ID: process.env.NEXT_PUBLIC_APPWRITE_PROJECT_ID, + APPWRITE_API_KEY: process.env.APPWRITE_API_KEY, + SITE_NAME: process.env.SITE_NAME, + NEXT_PUBLIC_SITE_URL: process.env.NEXT_PUBLIC_SITE_URL, + IMAGE_DOMAINS: process.env.IMAGE_DOMAINS } } }