diff --git a/Jenkinsfile b/Jenkinsfile index e290d7ed..6fbf0385 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -22,7 +22,7 @@ pipeline { git( url: httpUrl, credentialsId: 'gitlab-jenkins-localhost', - branch: 'dillon/jenkins-vapor-34-vue-polling' + branch: 'dillon/34-jenkins-vapor' ) } } diff --git a/composer.json b/composer.json index 2f00300c..f9a24d18 100644 --- a/composer.json +++ b/composer.json @@ -9,6 +9,7 @@ "license": "MIT", "require": { "php": "^7.2.5", + "ext-bcmath": "*", "ext-fileinfo": "*", "ext-json": "*", "ext-zip": "*", @@ -21,6 +22,8 @@ "intervention/image": "^2.5", "laravel/framework": "^8.0", "laravel/tinker": "^2.0", + "laravel/vapor-cli": "^1.55", + "laravel/vapor-core": "^2.33", "maatwebsite/excel": "^3.1", "mpdf/mpdf": "^8.1", "rinvex/countries": "^6.1", @@ -31,10 +34,7 @@ "staudenmeir/eloquent-has-many-deep": "^1.7", "timehunter/laravel-google-recaptcha-v3": "~2.5", "tymon/jwt-auth": "^1.0", - "webklex/laravel-pdfmerger": "^1.3", - "ext-bcmath": "*", - "laravel/vapor-cli": "^1.55", - "laravel/vapor-core": "^2.30" + "webklex/laravel-pdfmerger": "^1.3" }, "require-dev": { "facade/ignition": "^2.3.6", diff --git a/vapor.yml b/vapor.yml index d364dc8e..25108a94 100644 --- a/vapor.yml +++ b/vapor.yml @@ -1,5 +1,5 @@ -id: 48019 -name: vapor-laravel-poc +id: 53427 +name: exchange separate-vendor: true environments: production: @@ -7,7 +7,7 @@ environments: memory: 1024 cli-memory: 512 database: vapor-laravel-poc-db - storage: exchange-2.0-replica + storage: exchange-2.0-production # gateway-version: 2 # cache: vapor-laravel-poc-cache runtime: 'docker'