dev #2

Merged
webmaster merged 34 commits from dev into main 2025-12-20 20:04:57 +00:00
2 changed files with 18 additions and 1 deletions
Showing only changes of commit 39abf1b5fc - Show all commits

View File

@@ -71,6 +71,9 @@ jobs:
echo "📦 Loading image"
docker load < /tmp/merchbay_admin_dev.tar.gz
echo "🧹 Removing old merchbay_admin images"
docker images | grep merchbay_admin | grep -v "$(docker images merchbay_admin:dev -q)" | awk '{print $3}' | xargs -r docker rmi -f || true
echo "📄 Updating compose file"
cp /tmp/docker-compose.yml "$DEPLOY_DIR/"
@@ -112,7 +115,11 @@ jobs:
echo "🧹 Cleanup"
rm -f /tmp/merchbay_admin_dev.tar.gz /tmp/docker-compose.yml
docker image prune -f
echo "🧹 Pruning unused Docker resources"
docker image prune -af --filter "until=24h" || true
docker container prune -f || true
docker system df
echo "✅ Deployment completed"
EOF

View File

@@ -47,6 +47,10 @@ jobs:
mkdir -p \$DEPLOY_DIR
cd /tmp
docker load < merchbay_admin.tar.gz
echo 'Removing old merchbay_admin images'
docker images | grep merchbay_admin | grep -v "\$(docker images merchbay_admin:latest -q)" | awk '{print \$3}' | xargs -r docker rmi -f || true
cp docker-compose.yml \$DEPLOY_DIR/
cd \$DEPLOY_DIR
@@ -66,6 +70,12 @@ jobs:
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 'Pruning unused Docker resources'
docker image prune -af --filter "until=24h" || true
docker container prune -f || true
docker system df
echo 'Production deployment completed successfully!'
echo 'Application available at: https://merchbay.com'
"