diff --git a/.drone.yml b/.drone.yml index 7b6f5b6..7d64c09 100644 --- a/.drone.yml +++ b/.drone.yml @@ -4,26 +4,10 @@ name: bogazici-api trigger: branch: - - develop - test - main steps: - - name: laravel-check - image: php:8.4-cli - when: - branch: - - develop - commands: - - apt-get update && apt-get install -y git unzip curl libzip-dev libicu-dev default-mysql-client - - docker-php-ext-install pdo_mysql zip intl - - curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer - - cp .env.example .env || true - - composer install --no-interaction --prefer-dist --optimize-autoloader - - php artisan key:generate --force || true - - php artisan optimize:clear || true - - php artisan test || true - - name: deploy-test image: appleboy/drone-ssh when: diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index 89900fa..53a0e19 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -5,7 +5,6 @@ services: build: context: . dockerfile: Dockerfile - container_name: bdc-api-prod restart: unless-stopped volumes: - ./:/var/www/html diff --git a/docker-compose.test.yml b/docker-compose.test.yml index db71680..d4a7e17 100644 --- a/docker-compose.test.yml +++ b/docker-compose.test.yml @@ -5,7 +5,6 @@ services: build: context: . dockerfile: Dockerfile - container_name: bdc-api-test restart: unless-stopped volumes: - ./:/var/www/html diff --git a/scripts/deploy-prod.sh b/scripts/deploy-prod.sh index d574ac2..16ff8a5 100755 --- a/scripts/deploy-prod.sh +++ b/scripts/deploy-prod.sh @@ -37,9 +37,13 @@ if ! grep -q '^APP_KEY=base64:' .env; then exit 1 fi + mkdir -p "$UPLOADS_DIR" chmod 2775 "$UPLOADS_DIR" 2>/dev/null || true +docker rm -f bogazici-api-prod-bdc-api-prod-1 2>/dev/null || true +docker rm -f bdc-api-prod 2>/dev/null || true + docker compose -p "$COMPOSE_PROJECT" -f "$COMPOSE_FILE" down --remove-orphans || true docker compose -p "$COMPOSE_PROJECT" -f "$COMPOSE_FILE" up -d --build diff --git a/scripts/deploy-test.sh b/scripts/deploy-test.sh index 2d5f98e..95d7f24 100755 --- a/scripts/deploy-test.sh +++ b/scripts/deploy-test.sh @@ -40,9 +40,13 @@ fi mkdir -p "$UPLOADS_DIR" chmod 2775 "$UPLOADS_DIR" 2>/dev/null || true +docker rm -f bogazici-api-test-bdc-api-test-1 2>/dev/null || true +docker rm -f bdc-api-test 2>/dev/null || true + docker compose -p "$COMPOSE_PROJECT" -f "$COMPOSE_FILE" down --remove-orphans || true docker compose -p "$COMPOSE_PROJECT" -f "$COMPOSE_FILE" up -d --build + echo "⏳ Container hazır olması bekleniyor..." for i in {1..30}; do if docker compose -p "$COMPOSE_PROJECT" -f "$COMPOSE_FILE" ps --status running | grep -q "$CONTAINER"; then