webmaster/merchbay_admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dev #2

Merged
webmaster merged 34 commits from dev into main 2025-12-20 20:04:57 +00:00
Conversation 0 Commits 34 Files Changed 11 +12 -13
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1c29fbf958 - Show all commits

25
.gitea/workflows/deploy.yml
View File

@@ -1,4 +1,4 @@
name: Deploy Production
name: Deploy Production (admin.merchbay.app)
on:
push:
@@ -35,14 +35,14 @@ jobs:
run: |
mkdir -p ~/.ssh
chmod 700 ~/.ssh
echo "$PROD_DEPLOY_SSH_KEY" > ~/.ssh/deploy_key
echo "$DEPLOY_SSH_KEY" > ~/.ssh/deploy_key
chmod 600 ~/.ssh/deploy_key
ssh-keygen -y -f ~/.ssh/deploy_key > /dev/null 2>&1 || { echo "Error: Invalid SSH key format"; exit 1; }
cd /workspace/repo
scp -o StrictHostKeyChecking=no -i ~/.ssh/deploy_key merchbay_admin.tar.gz docker-compose.yml "$PROD_DEPLOY_USER@$PROD_DEPLOY_HOST:/tmp/"
scp -o StrictHostKeyChecking=no -i ~/.ssh/deploy_key merchbay_admin.tar.gz docker-compose.yml "$DEPLOY_USER@$DEPLOY_HOST:/tmp/"
ssh -o StrictHostKeyChecking=no -i ~/.ssh/deploy_key "$PROD_DEPLOY_USER@$PROD_DEPLOY_HOST" "
ssh -o StrictHostKeyChecking=no -i ~/.ssh/deploy_key "$DEPLOY_USER@$DEPLOY_HOST" "
DEPLOY_DIR='/var/www/merchbay_admin'
mkdir -p \$DEPLOY_DIR
cd /tmp
@@ -61,14 +61,13 @@ jobs:
docker compose down || true
docker image prune -f
docker network inspect traefik-public >/dev/null 2>&1 || docker network create traefik-public
export DOMAIN=merchbay.com
export APP_URL=https://merchbay.com
docker network inspect crew-app-net >/dev/null 2>&1 || docker network create crew-app-net
export DOMAIN=admin.merchbay.app
export APP_URL=https://admin.merchbay.app
docker compose up -d
sleep 10
docker compose exec -T app php artisan migrate --force
docker compose exec -T app php artisan config:cache
docker compose exec -T app php artisan route:cache
docker compose exec -T app php artisan view:cache
rm -f /tmp/merchbay_admin.tar.gz /tmp/docker-compose.yml
echo 'Aggressive Docker cleanup to reclaim space'
@@ -80,15 +79,15 @@ jobs:
docker system df
echo 'Production deployment completed successfully!'
echo 'Application available at: https://merchbay.com'
echo 'Application available at: https://admin.merchbay.app'
"
env:
PROD_DEPLOY_SSH_KEY: ${{ secrets.PROD_DEPLOY_SSH_KEY }}
PROD_DEPLOY_USER: ${{ secrets.PROD_DEPLOY_USER }}
PROD_DEPLOY_HOST: ${{ secrets.PROD_DEPLOY_HOST }}
DEPLOY_SSH_KEY: ${{ secrets.DEPLOY_SSH_KEY }}
DEPLOY_USER: ${{ secrets.DEPLOY_USER }}
DEPLOY_HOST: ${{ secrets.DEPLOY_HOST }}
- name: Health Check
shell: sh
run: |
sleep 10
curl -f https://merchbay.com || exit 1
curl -f https://admin.merchbay.app || exit 1