From 011f8ed75ef983fd185abe5f53a22f845c273a4f Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Mon, 11 Dec 2023 02:06:46 +0800 Subject: [PATCH 1/7] Setup dev.vapor-explore.izyim.com --- Jenkinsfile | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 8b68044..2431d21 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -27,6 +27,13 @@ pipeline { branch: 'vapor/staging' ) break + case "vapor/development": + git( + url: 'https://gitlab.com/CIEFWorldwideSdnBhd/vapor-laravel-explore.git', + credentialsId: 'gitlab-jenkins-localhost', + branch: 'vapor/development' + ) + break case "origin/test": git( url: 'https://gitlab.com/CIEFWorldwideSdnBhd/vapor-laravel-explore.git', @@ -63,6 +70,9 @@ pipeline { case "vapor/staging": sh "vendor/bin/vapor deploy staging --message='${gitCommitMessage}'" break + case "vapor/development": + sh "vendor/bin/vapor deploy development --message='${gitCommitMessage}'" + break case "origin/test": sh "vendor/bin/vapor deploy development --message='${gitCommitMessage}'" break From dd941161f252a76afc89f639a06b2be175bfb8b1 Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Sat, 16 Dec 2023 16:51:55 +0800 Subject: [PATCH 2/7] Change database --- vapor.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vapor.yml b/vapor.yml index 8272115..7c60e38 100644 --- a/vapor.yml +++ b/vapor.yml @@ -5,7 +5,7 @@ environments: domain: production.vapor-explore.izyim.com memory: 1024 cli-memory: 512 - database: vapor-laravel-poc-db + database: cief-rds-mysql storage: vapor-laravel-explore-production runtime: 'docker' timeout: 180 @@ -20,7 +20,7 @@ environments: domain: staging.vapor-explore.izyim.com memory: 1024 cli-memory: 512 - database: vapor-laravel-poc-db + database: cief-rds-mysql storage: vapor-laravel-explore-staging runtime: 'docker' timeout: 180 @@ -35,7 +35,7 @@ environments: domain: dev.vapor-explore.izyim.com memory: 1024 cli-memory: 512 - database: vapor-laravel-poc-db + database: cief-rds-mysql storage: vapor-laravel-explore-development runtime: 'docker' timeout: 180 From 1226b4248a5017bede83c51fb5cf2b229076d42d Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Sun, 8 Sep 2024 01:21:15 +0800 Subject: [PATCH 3/7] Minor display amendment for testing --- resources/views/welcome.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php index b8b1b97..378209b 100644 --- a/resources/views/welcome.blade.php +++ b/resources/views/welcome.blade.php @@ -56,7 +56,7 @@
- Laravel has wonderful, thorough documentation covering every aspect of the framework. Whether you are new to the framework or have previous experience with Laravel, we recommend reading all of the documentation from beginning to end. + A. Laravel has wonderful, thorough documentation covering every aspect of the framework. Whether you are new to the framework or have previous experience with Laravel, we recommend reading all of the documentation from beginning to end.
From b03f9d48c827f8c7ed73b670514024704ec41cfd Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Sun, 8 Sep 2024 01:44:10 +0800 Subject: [PATCH 4/7] Update Jenkinsfile --- Jenkinsfile | 44 +++++++++++++++++++++++++++++--------------- 1 file changed, 29 insertions(+), 15 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2431d21..ba1a538 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,8 +1,10 @@ pipeline { agent { docker { - image 'dillonngo/docker-based-image:poc' - args "--group-add 992 -v /var/run/docker.sock:/var/run/docker.sock" + args '--group-add 992 -v /var/run/docker.sock:/var/run/docker.sock' + image '303644228504.dkr.ecr.ap-southeast-1.amazonaws.com/jenkins-pipeline-agent:latest' + registryCredentialsId "ecr:ap-southeast-1:aws-ec2-instance-iam-role" + registryUrl "https://303644228504.dkr.ecr.ap-southeast-1.amazonaws.com" } } environment { @@ -12,26 +14,16 @@ pipeline { stage('Download source code from Git') { steps { script{ + currentBuild.description = 'Step 1 of 6 Completed' + println("GIT GIT_BRANCH: " + GIT_BRANCH) switch(GIT_BRANCH) { case "vapor/production": - git( - url: 'https://gitlab.com/CIEFWorldwideSdnBhd/vapor-laravel-explore.git', - credentialsId: 'gitlab-jenkins-localhost', - branch: 'vapor/production' - ) - break case "vapor/staging": - git( - url: 'https://gitlab.com/CIEFWorldwideSdnBhd/vapor-laravel-explore.git', - credentialsId: 'gitlab-jenkins-localhost', - branch: 'vapor/staging' - ) - break case "vapor/development": git( url: 'https://gitlab.com/CIEFWorldwideSdnBhd/vapor-laravel-explore.git', credentialsId: 'gitlab-jenkins-localhost', - branch: 'vapor/development' + branch: GIT_BRANCH ) break case "origin/test": @@ -42,6 +34,7 @@ pipeline { ) break } + currentBuild.description = 'Step 2 of 6 Completed' } } } @@ -49,12 +42,18 @@ pipeline { stage('Install') { steps { sh 'composer update' + script{ + currentBuild.description = 'Step 3 of 6 Completed' + } } } stage('Tests') { steps { sh 'vendor/bin/phpunit tests/Unit' + script{ + currentBuild.description = 'Step 4 of 6 Completed' + } } } @@ -63,6 +62,7 @@ pipeline { script{ String gitCommitMessage = getCommitMessage() println("GIT CommitMessage: " + gitCommitMessage) + println("GIT GIT_BRANCH: " + GIT_BRANCH) switch(GIT_BRANCH) { case "vapor/production": sh "vendor/bin/vapor deploy production --message='${gitCommitMessage}'" @@ -77,10 +77,23 @@ pipeline { sh "vendor/bin/vapor deploy development --message='${gitCommitMessage}'" break } + currentBuild.description = 'Step 5 of 6 Completed' } } } + stage('Cleanup') { + steps { + script { + try { + sh 'docker image prune -a -f' + } catch (Exception e) { + echo "Error during cleanup: ${e.message}" + } + currentBuild.description = 'Step 6 of 6 Completed' + } + } + } } } @@ -92,5 +105,6 @@ String getCommitMessage(){ commitMessage = entry.msg } } + commitMessage = commitMessage.replace("'", "`") return commitMessage } From a7e3b7b0b3f5cbc55a9ccc6a44f01cc99a76c39d Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Sun, 8 Sep 2024 01:55:51 +0800 Subject: [PATCH 5/7] Update new AWS RDS database setup --- vapor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vapor.yml b/vapor.yml index 7c60e38..3ba16fb 100644 --- a/vapor.yml +++ b/vapor.yml @@ -35,7 +35,7 @@ environments: domain: dev.vapor-explore.izyim.com memory: 1024 cli-memory: 512 - database: cief-rds-mysql + database: cief-aws-rds-mysql storage: vapor-laravel-explore-development runtime: 'docker' timeout: 180 From d0fd85857d9e6f9fd96ff17e48ef93fdb052a6b2 Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Sun, 8 Sep 2024 01:56:36 +0800 Subject: [PATCH 6/7] Update new AWS RDS database setup --- vapor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vapor.yml b/vapor.yml index 3ba16fb..206423d 100644 --- a/vapor.yml +++ b/vapor.yml @@ -5,7 +5,7 @@ environments: domain: production.vapor-explore.izyim.com memory: 1024 cli-memory: 512 - database: cief-rds-mysql + database: cief-aws-rds-mysql storage: vapor-laravel-explore-production runtime: 'docker' timeout: 180 @@ -20,7 +20,7 @@ environments: domain: staging.vapor-explore.izyim.com memory: 1024 cli-memory: 512 - database: cief-rds-mysql + database: cief-aws-rds-mysql storage: vapor-laravel-explore-staging runtime: 'docker' timeout: 180 From 3c60f1d42e29bd3c0a9e4ae089de1c3095a45fc2 Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Mon, 28 Oct 2024 17:05:05 +0800 Subject: [PATCH 7/7] Update new AWS RDS database setup --- vapor.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vapor.yml b/vapor.yml index 206423d..b6e589f 100644 --- a/vapor.yml +++ b/vapor.yml @@ -5,7 +5,7 @@ environments: domain: production.vapor-explore.izyim.com memory: 1024 cli-memory: 512 - database: cief-aws-rds-mysql + database: cief-amazon-rds-mysql storage: vapor-laravel-explore-production runtime: 'docker' timeout: 180 @@ -20,7 +20,7 @@ environments: domain: staging.vapor-explore.izyim.com memory: 1024 cli-memory: 512 - database: cief-aws-rds-mysql + database: cief-amazon-rds-mysql storage: vapor-laravel-explore-staging runtime: 'docker' timeout: 180 @@ -35,7 +35,7 @@ environments: domain: dev.vapor-explore.izyim.com memory: 1024 cli-memory: 512 - database: cief-aws-rds-mysql + database: cief-amazon-rds-mysql storage: vapor-laravel-explore-development runtime: 'docker' timeout: 180