From a8366d094413516a9bd0bb79f2e91070f32cfe55 Mon Sep 17 00:00:00 2001 From: saeid Date: Fri, 21 Apr 2023 02:36:35 +0330 Subject: [PATCH] test --- .drone.yml | 22 +++--- .gitignore | 1 - Dockerfile | 26 ++++++- composer-prod.json | 168 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 203 insertions(+), 14 deletions(-) create mode 100644 composer-prod.json diff --git a/.drone.yml b/.drone.yml index 489ec16..3b96bba 100644 --- a/.drone.yml +++ b/.drone.yml @@ -5,26 +5,24 @@ name: default steps: - name: build to production commands: - - sudo cp /home/administrator/apps/willaengine/composer-prod.json . - - docker build -t registry.willaspace.com/willaspace/willaengine:latest --build-arg COMPOSER_FILE_NAME=composer-prod . + - docker build -t registry.willaspace.com/willaspace/willaengine-test:latest --build-arg COMPOSER_FILE_NAME=composer-prod . when: branch: - master - name: deploy to production commands: - - cd /home/administrator/apps/willaengine/ ; docker-compose up -d - - docker exec willaengine bash -c "COMPOSER=composer-prod.json composer update" - - docker exec willaengine php artisan config:cache - - docker exec willaengine php artisan route:cache -# - docker exec willaengine php artisan migrate --path=vendor/wm/store/database/migrations --force - - docker exec willaengine_worker bash -c "COMPOSER=composer-prod.json composer update" - - docker exec willaengine_worker service supervisor start - - docker network connect nginx_default willaengine + - cd /apps/willaengine/ ; docker-compose up -d + - docker exec willaengine-test bash -c "COMPOSER=composer-prod.json composer update" + - docker exec willaengine-test php artisan config:cache + - docker exec willaengine-test php artisan route:cache +# - docker exec willaengine_worker bash -c "COMPOSER=composer-prod.json composer update" +# - docker exec willaengine_worker service supervisor start +# - docker network connect nginx_default willaengine when: branch: - master - + - name: build to staging commands: @@ -52,4 +50,4 @@ trigger: branch: - master - dev - + diff --git a/.gitignore b/.gitignore index 6987b0b..27ca729 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,6 @@ # Created by https://www.toptal.com/developers/gitignore/api/visualstudiocode,laravel,vuejs,phpstorm # Edit at https://www.toptal.com/developers/gitignore?templates=visualstudiocode,laravel,vuejs, phpstorm -composer-prod.json resources/views/sites diff --git a/Dockerfile b/Dockerfile index 56a8d6a..f33d781 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,28 @@ -FROM fsaravi/standard-laravel:7.4 +FROM willaengine/standard-laravel:7.4 + +ARG COMPOSER_FILE_NAME=composer WORKDIR /var/www/html + +##################################### +# Composer: +##################################### + +COPY database /var/www/html/database + +COPY $COMPOSER_FILE_NAME.* /var/www/html/ + +RUN COMPOSER=$COMPOSER_FILE_NAME.json composer install --no-scripts + +COPY . /var/www/html + +RUN chown -R www-data:www-data \ + /var/www/html/public \ + /var/www/html/storage \ + /var/www/html/bootstrap/cache \ + /var/www/.ssh \ + /var/www/html/storage/letsencrypt && \ + chmod 755 /var/www/html/storage/letsencrypt/Bash/auth-hook.sh + + RUN php artisan morphmap:cache diff --git a/composer-prod.json b/composer-prod.json new file mode 100644 index 0000000..78c6d0e --- /dev/null +++ b/composer-prod.json @@ -0,0 +1,168 @@ +{ + "name": "willaengine/laravel", + "type": "project", + "description": "The WillaEngine Applications.", + "keywords": [ + "framework", + "laravel", + "WillaEngine" + ], + "license": "MIT", + "require": { + "php": "^7.4", + "coraxster/flysystem-aws-s3-v3-minio": "^1.0", + "fideloper/proxy": "^4.0", + "io-developer/php-whois": "^4.0", + "kalnoy/nestedset": "^6.0", + "laravel/framework": "^8.0", + "laravel/passport": "^10", + "laravel/tinker": "^2.0", + "maatwebsite/excel": "^3.1", + "owen-it/laravel-auditing": "^13.5", + "sentry/sentry-laravel": "^2.3", + "silber/bouncer": "v1.0.0-rc.10", + "spatie/laravel-medialibrary": "^8.0.0", + "wm/admin": "dev-master", + "wm/app-management": "dev-master", + "wm/blog": "dev-master", + "wm/common": "dev-master", + "wm/contact-us": "dev-master", + "wm/core": "dev-master", + "wm/crm": "dev-master", + "wm/finance": "dev-master", + "wm/lms": "dev-master", + "wm/notification": "dev-master", + "wm/portfolio": "dev-master", + "wm/product": "dev-master", + "wm/roll-call": "dev-master", + "wm/service": "dev-master", + "wm/service-store": "dev-master", + "wm/store": "dev-master", + "wm/web-builder": "dev-master", + "zircote/swagger-php": "^3.0" + }, + "provide": { + "ext-imagick": "*" + }, + "require-dev": { + "facade/ignition": "^2.3.6", + "fzaninotto/faker": "^1.4", + "mockery/mockery": "^1.0", + "nunomaduro/collision": "^5.0", + "phpunit/phpunit": "^9.0" + }, + "config": { + "optimize-autoloader": true, + "preferred-install": "dist", + "sort-packages": true, + "allow-plugins": { + "php-http/discovery": true + } + }, + "extra": { + "laravel": { + "dont-discover": [] + } + }, + "autoload": { + "psr-4": { + "App\\": "app/", + "Modules\\": "Modules/" + }, + "classmap": [ + "database/seeds", + "database/factories" + ] + }, + "autoload-dev": { + "psr-4": { + "Tests\\": "tests/" + } + }, + "minimum-stability": "dev", + "prefer-stable": true, + "scripts": { + "post-autoload-dump": [ + "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump", + "@php artisan package:discover --ansi", + "@php artisan morphmap:cache" + ], + "post-root-package-install": [ + "@php -r \"file_exists('.env') || copy('.env.example', '.env');\"" + ], + "post-create-project-cmd": [ + "@php artisan key:generate --ansi" + ] + }, + + "repositories": [ + { + "type": "vcs", + "url": "git@git.willaspace.com:WillaEngine-Project/crm.git" + }, + { + "type": "vcs", + "url": "git@git.willaspace.com:WillaEngine-Project/common.git" + }, + { + "type": "vcs", + "url": "git@git.willaspace.com:WillaEngine-Project/core.git" + }, + { + "type": "vcs", + "url": "git@git.willaspace.com:WillaEngine-Project/blog.git" + }, + { + "type": "vcs", + "url": "git@git.willaspace.com:WillaEngine-Project/portfolio.git" + }, + { + "type": "vcs", + "url": "git@git.willaspace.com:WillaEngine-Project/product.git" + }, + { + c "type": "vcs", + "url": "git@git.willaspace.com:WillaEngine-Project/service.git" + }, + { + "type": "vcs", + "url": "git@git.willaspace.com:WillaEngine-Project/store.git" + }, + { + "type": "vcs", + "url": "git@git.willaspace.com:WillaEngine-Project/notification.git" + }, + { + "type": "vcs", + "url": "git@git.willaspace.com:WillaEngine-Project/roll-call.git" + }, + { + "type": "vcs", + "url": "git@git.willaspace.com:WillaEngine-Project/app-management.git" + }, + { + "type": "vcs", + "url": "git@git.willaspace.com:WillaEngine-Project/web-builder.git" + }, + { + "type": "vcs", + "url": "git@git.willaspace.com:WillaEngine-Project/finance.git" + }, + { + "type": "vcs", + "url": "git@git.willaspace.com:WillaEngine-Project/service-store.git" + }, + { + "type": "vcs", + "url": "git@git.willaspace.com:WillaEngine-Project/admin.git" + }, + { + "type": "vcs", + "url": "git@git.willaspace.com:WillaEngine-Project/lms.git" + }, + { + "type": "vcs", + "url": "git@git.willaspace.com:WillaEngine-Project/contact-us.git" + } + ] +}