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 +1 -6
2 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 676988fabb - Show all commits

5
.gitea/workflows/deploy-dev.yml
View File

@@ -94,7 +94,7 @@ jobs:
ssh -i ~/.ssh/id_ed25519 ${DEPLOY_USER}@${DEPLOY_HOST} << 'EOF' ssh -i ~/.ssh/id_ed25519 ${DEPLOY_USER}@${DEPLOY_HOST} << 'EOF'
set -e set -e
DEPLOY_DIR="/var/www/merchbay_admin_dev" DEPLOY_DIR="/home/deploy/apps/merchbay_admin_dev"
mkdir -p $DEPLOY_DIR mkdir -p $DEPLOY_DIR
cd /tmp cd /tmp
@@ -125,9 +125,6 @@ jobs:
echo "✅ Development deployment completed" echo "✅ Development deployment completed"
EOF EOF
env:
DEPLOY_USER: ${{ secrets.DEPLOY_USER }}
DEPLOY_HOST: ${{ secrets.DEPLOY_HOST }}
- name: Health Check - name: Health Check
shell: sh shell: sh

2
docker-compose.yml
View File

@@ -1,5 +1,3 @@
version: '3.8'
services: services:
app: app:
build: build: