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

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

@@ -79,7 +79,8 @@ jobs:
echo "🔍 Checking .env file" echo "🔍 Checking .env file"
if [ ! -f .env ]; then if [ ! -f .env ]; then
echo "❌ .env file not found at $DEPLOY_DIR/.env" echo "❌ .env file not found at $DEPLOY_DIR/.env"
echo "Please create it first. See DEPLOYMENT-SETUP.md" echo "Please create it first with required variables:"
echo " - DB_*, IMAGES_DIRECTORY, PRODUCTION_PRIVATE_SERVER"
exit 1 exit 1
fi fi

3
.gitea/workflows/deploy.yml
View File

@@ -50,7 +50,8 @@ jobs:
cp docker-compose.yml \$DEPLOY_DIR/ cp docker-compose.yml \$DEPLOY_DIR/
cd \$DEPLOY_DIR cd \$DEPLOY_DIR
# .env file should already exist on server with all secrets # .env file should already exist on server with all required variables
# Required: DB_*, IMAGES_DIRECTORY, PRODUCTION_PRIVATE_SERVER
# If it doesn't exist, deployment will fail (this is intentional for security) # If it doesn't exist, deployment will fail (this is intentional for security)
docker compose down || true docker compose down || true

2
docker-compose.yml
View File

@@ -13,6 +13,8 @@ services:
- DB_DATABASE=${DB_DATABASE} - DB_DATABASE=${DB_DATABASE}
- DB_USERNAME=${DB_USERNAME} - DB_USERNAME=${DB_USERNAME}
- DB_PASSWORD=${DB_PASSWORD} - DB_PASSWORD=${DB_PASSWORD}
- IMAGES_DIRECTORY=${IMAGES_DIRECTORY}
- PRODUCTION_PRIVATE_SERVER=${PRODUCTION_PRIVATE_SERVER}
volumes: volumes:
- ./storage:/var/www/html/storage - ./storage:/var/www/html/storage
- ./public/uploads:/var/www/html/public/uploads - ./public/uploads:/var/www/html/public/uploads