alireza_hassani
/
willaengine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: merge dev into master

Browse Source
pull/150/head^2
farid 3 years ago
parent 1f4a2c5061 b72ea3d3cf
commit 951d2f90be
5 changed files with 25 additions and 184 deletions
Show Stats Download Patch File Download Diff File

2
.dockerignore
Unescape View File

@ -3,5 +3,3 @@ vendor
node_modules
modules
composer.lock
Dockerfile*
Jenkinsfile

1
.gitignore vendored
Unescape View File

@ -3,6 +3,7 @@
# 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
### Laravel ###
/vendor/

15
Jenkinsfile vendored
Unescape View File

@ -5,24 +5,15 @@ pipeline {
}
}
stages {
stage('build for production') {
stage('build') {
when {
branch 'master'
}
steps {
sh 'docker build -t registry.willaspace.com/willaspace/${IMAGE_NAME}:latest --build-arg ssh_prv_key="$(cat /home/administrator/.ssh/id_rsa)" .'
sh 'cd /home/administrator/apps/${IMAGE_NAME}/;docker build -t registry.willaspace.com/willaspace/${IMAGE_NAME}:latest .'
sh 'cd /home/administrator/apps/${IMAGE_NAME}/;sudo ./BuildDocker'
}
}
stage('build for staging') {
when {
branch 'dev'
}
steps {
sh 'docker build -t registry.willaspace.com/willaspace/${IMAGE_NAME}-staging:latest -f Dockerfile.staging --build-arg ssh_prv_key="$(cat /home/administrator/.ssh/id_rsa)" .'
sh 'docker build -t registry.willaspace.com/willaspace/${IMAGE_NAME}-staging-nginx:latest -f Dockerfile.nginx .'
}
}
stage('deploy to production') {
when {
branch 'master'
@ -40,7 +31,7 @@ pipeline {
branch 'dev'
}
steps {
sh 'cd /apps/${IMAGE_NAME}-staging/ ; docker-compose up -d'
sh 'echo ${IMAGE_NAME}-staging comming soon ...'
}
}
}

163
composer-prod.json
Unescape View File

@ -1,163 +0,0 @@
{
"name": "laravel/laravel",
"type": "project",
"description": "The Laravel Framework.",
"keywords": [
"framework",
"laravel"
],
"license": "MIT",
"require": {
"php": "^7.4",
"coraxster/flysystem-aws-s3-v3-minio": "^1.0",
"fideloper/proxy": "^4.0",
"laravel/framework": "^8.0",
"laravel/passport": "^10",
"laravel/tinker": "^2.0",
"maatwebsite/excel": "^3.1",
"kalnoy/nestedset": "^6.0",
"sentry/sentry-laravel": "^2.3",
"spatie/laravel-medialibrary": "^8.0.0",
"io-developer/php-whois": "^4.0",
"silber/bouncer": "v1.0.0-rc.10",
"wm/blog": "dev-master",
"wm/common": "dev-master",
"wm/core": "dev-master",
"wm/crm": "dev-master",
"wm/portfolio": "dev-master",
"wm/product": "dev-master",
"wm/service": "dev-master",
"wm/store": "dev-master",
"wm/finance": "dev-master",
"wm/admin": "dev-master",
"wm/web-builder": "dev-master",
"wm/app-management": "dev-master",
"wm/notification": "dev-master",
"wm/roll-call": "dev-master",
"wm/lms": "dev-master",
"wm/service-store": "dev-master",
"wm/contact-us": "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
},
"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"
},
{
"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"
}
]
}

26
webpack.mix.staging.js vendored
Unescape View File

@ -35,11 +35,25 @@ mix.webpackConfig({
mix.js('resources/js/Home/app.js', 'public/js/vue/Home').vue({version: 2});
require('./vendor/wm/core/webpack.mix');
require('./vendor/wm/common/webpack.mix');
require('./vendor/wm/crm/webpack.mix');
require('./vendor/wm/blog/webpack.mix');
// require('./vendor/wm/warehouse/webpack.mix');
// require('./vendor/wm/reservation/webpack.mix');
require('./vendeor/wm/core/webpack.mix');
require('./vendeor/wm/common/webpack.mix');
require('./vendeor/wm/crm/webpack.mix');
require('./vendeor/wm/blog/webpack.mix');
require('./vendeor/wm/portfolio/webpack.mix');
require('./vendeor/wm/product/webpack.mix');
require('./vendeor/wm/service/webpack.mix');
require('./vendeor/wm/store/webpack.mix');
require('./vendeor/wm/admin/webpack.mix');
require('./vendeor/wm/notification/webpack.mix');
require('./vendeor/wm/roll-call/webpack.mix');
require('./vendeor/wm/finance/webpack.mix');
require('./vendeor/wm/app-management/webpack.mix');
require('./vendeor/wm/web-builder/webpack.mix');
require('./vendeor/wm/service-store/webpack.mix');
require('./vendeor/wm/lms/webpack.mix');
require('./vendeor/wm/service-store/webpack.mix');
require('./vendeor/wm/contact-us/webpack.mix');
// require('./vendeor/wm/warehouse/webpack.mix');
// require('./vendeor/wm/reservation/webpack.mix');
mix.version();

Write Preview
Loading…
Cancel
Save