Compare commits

..

No commits in common. "a693cecb61767f342db15f83f5f63bceaac5b3a8" and "8a42240c2f1677acc43cd2512fcdf00066f6844e" have entirely different histories.

5 changed files with 13 additions and 4 deletions

View File

@ -5,8 +5,10 @@ MODE=${1:-production}
if [ "$MODE" = "staging" ]; then if [ "$MODE" = "staging" ]; then
COMPOSE="docker-compose.staging.yml" COMPOSE="docker-compose.staging.yml"
BUILD_CMD="npm run build:staging"
else else
COMPOSE="docker-compose.yml" COMPOSE="docker-compose.yml"
BUILD_CMD="npm run build:prod"
fi fi
echo "🚀 Aziros deploying... ($MODE)" echo "🚀 Aziros deploying... ($MODE)"
@ -21,6 +23,13 @@ echo "→ Composer install..."
docker compose -f $COMPOSE exec -T app \ docker compose -f $COMPOSE exec -T app \
composer install --no-dev --optimize-autoloader composer install --no-dev --optimize-autoloader
# NPM Build
echo "→ Assets bauen..."
docker compose -f $COMPOSE exec -T app \
npm install --silent
docker compose -f $COMPOSE exec -T app \
$BUILD_CMD
# Migrations # Migrations
echo "→ Migrationen..." echo "→ Migrationen..."
docker compose -f $COMPOSE exec -T app \ docker compose -f $COMPOSE exec -T app \

View File

@ -16,7 +16,7 @@ services:
volumes: volumes:
- ./db_data:/var/lib/mysql - ./db_data:/var/lib/mysql
healthcheck: healthcheck:
test: ["CMD-SHELL", "mariadb-admin ping -h localhost -u root -p$$DB_ROOT_PASSWORD || exit 1"] test: ["CMD-SHELL", "mariadb-admin ping -h localhost -u root -p$$MARIADB_ROOT_PASSWORD || exit 1"]
interval: 5s interval: 5s
timeout: 5s timeout: 5s
retries: 20 retries: 20

View File

@ -16,7 +16,7 @@ services:
volumes: volumes:
- ./db_data:/var/lib/mysql - ./db_data:/var/lib/mysql
healthcheck: healthcheck:
test: ["CMD-SHELL", "mariadb-admin ping -h localhost -u root -p$$DB_ROOT_PASSWORD || exit 1"] test: ["CMD-SHELL", "mariadb-admin ping -h localhost -u root -p$$MARIADB_ROOT_PASSWORD || exit 1"]
interval: 5s interval: 5s
timeout: 5s timeout: 5s
retries: 20 retries: 20

File diff suppressed because one or more lines are too long

View File

@ -89,7 +89,7 @@
"src": "resources/fonts/BaiJamjuree/bai-jamjuree-regular.woff2" "src": "resources/fonts/BaiJamjuree/bai-jamjuree-regular.woff2"
}, },
"resources/js/app.js": { "resources/js/app.js": {
"file": "assets/app-D0SVbbbY.js", "file": "assets/app-Nj-qTlGi.js",
"name": "app", "name": "app",
"src": "resources/js/app.js", "src": "resources/js/app.js",
"isEntry": true, "isEntry": true,