From 3e4618b8f6378d89ecea62d98075fdaba30affdc Mon Sep 17 00:00:00 2001
From: azizi <dev.azizimail@gmail.com>
Date: Tue, 12 Oct 2021 15:04:55 +0000
Subject: [PATCH 1/5] Update '.gitignore'

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index fd1ded0..978a758 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,7 @@
 /development/
 
 # 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
+# Edit at https://www.toptal.com/developers/gitignore?templates=visualstudiocode,laravel,vuejs, phpstorm
 composer-prod.json
 
 ### Laravel ###

From 67d77176533f7c2129c7c92ad629333ff471c58d Mon Sep 17 00:00:00 2001
From: azizi <dev.azizimail@gmail.com>
Date: Mon, 15 Nov 2021 14:28:45 +0000
Subject: [PATCH 2/5] Update 'Jenkinsfile'

---
 Jenkinsfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 4dbea50..781bc84 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -3,7 +3,6 @@ pipeline {
     node {
       label 'willa'
     }
-
   }
   stages {
     stage('build') {

From 5c6c919ba8b1d019b9d1b3053ab04c9519964c1e Mon Sep 17 00:00:00 2001
From: Alireza Azizi <dev.azizimail@gmail.com>
Date: Thu, 24 Feb 2022 17:19:22 +0330
Subject: [PATCH 3/5] fix

---
 .drone.yml | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 2193f47..0e372da 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -2,23 +2,28 @@ kind: pipeline
 type: exec
 name: default
 
+settings:
+  sh_key:
+    from_secret: id-rsa
+
 steps:
-- name: build
-  commands:
-  - docker build  -t registry.willaspace.com/willaspace/${IMAGE_NAME}:latest --build-arg ssh_prv_key="$(cat /home/administrator/.ssh/id_rsa)"
-  - cd /home/administrator/apps/${IMAGE_NAME}/;sudo ./BuildDocker
+  - name: build_production
+    commands:
+      - docker build  -t registry.willaspace.com/willaspace/${IMAGE_NAME}:latest --build-arg ssh_prv_key="$(cat /home/administrator/.ssh/id_rsa)"
+      - cd /home/administrator/apps/${IMAGE_NAME}/;sudo ./BuildDocker
+    settiong
 
-- name: deploy
-  commands:
-  - cd /home/administrator/apps/${IMAGE_NAME}/ ; docker-compose up -d
-  - docker exec willaengine bash -c "COMPOSER=composer-prod.json composer update"
-  - docker exec willaengine service cron start
-  - docker exec willaengine php artisan config:cache
-  - docker exec willaengine php artisan route:cache
+  - name: deploy_production
+    commands:
+      - cd /home/administrator/apps/${IMAGE_NAME}/ ; docker-compose up -d
+      - docker exec willaengine bash -c "COMPOSER=composer-prod.json composer update"
+      - docker exec willaengine service cron start
+      - docker exec willaengine php artisan config:cache
+      - docker exec willaengine php artisan route:cache
 
 trigger:
   branch:
-  - master
+    - master
 
 environment:
   - IMAGE_NAME=willaengine

From 645852a6d6d64632ca22b1002b5613f60a4fcd20 Mon Sep 17 00:00:00 2001
From: Alireza Azizi <dev.azizimail@gmail.com>
Date: Thu, 24 Feb 2022 17:20:24 +0330
Subject: [PATCH 4/5] drone

---
 .drone.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.drone.yml b/.drone.yml
index 0e372da..56d0908 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -11,7 +11,6 @@ steps:
     commands:
       - docker build  -t registry.willaspace.com/willaspace/${IMAGE_NAME}:latest --build-arg ssh_prv_key="$(cat /home/administrator/.ssh/id_rsa)"
       - cd /home/administrator/apps/${IMAGE_NAME}/;sudo ./BuildDocker
-    settiong
 
   - name: deploy_production
     commands:

From cbe5c3dd0ccdbdcdb2dc0a528b9833d04f765eb3 Mon Sep 17 00:00:00 2001
From: Alireza Azizi <dev.azizimail@gmail.com>
Date: Thu, 24 Feb 2022 17:28:10 +0330
Subject: [PATCH 5/5] drone

---
 .drone.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.drone.yml b/.drone.yml
index 56d0908..5510cd4 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -4,7 +4,7 @@ name: default
 
 settings:
   sh_key:
-    from_secret: id-rsa
+    from_secret: /home/administrator/.ssh/id_rsa
 
 steps:
   - name: build_production