From 1fae85ff9d4c13aeb9c5b977da48779bb3703d22 Mon Sep 17 00:00:00 2001 From: Adam Townsend Date: Tue, 17 Oct 2023 21:26:23 -0700 Subject: [PATCH 1/7] moved the init step into one shell command to load it all, and don't use the secret.rb file --- Jenkinsfile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 0a449f6..32415cb 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -7,9 +7,11 @@ pipeline { stages { stage('Init') { steps { - sh 'rbenv local 3.2.2' - sh 'echo "ENV[\\\"APP_SESSION_SECRET\\\"] ||= $(ruby secret.rb)" > .env.rb' - sh 'echo "ENV[\\\"DB_NAME\\\"] ||= \\\"${DB_NAME}\\\"" >> .env.rb' + sh ''' #!/usr/local/bin/bash + rbenv local 3.2.2 + echo 'ENV["APP_SESSION_SECRET"] ||= $(ruby -rsecurerandom -e "puts SecureRandom.base64(64).inspect()")' > .env.rb + echo 'ENV["DB_NAME"] ||= "${DB_NAME}"' >> .env.rb + ''' } } stage('Build dependencies') { -- 2.41.0 From ff2a0e867d771bcd26887769677b358a19a3ab88 Mon Sep 17 00:00:00 2001 From: Adam Townsend Date: Tue, 17 Oct 2023 21:30:53 -0700 Subject: [PATCH 2/7] swap the quotes because single quotes doesn't exec the ruby command --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 32415cb..b0dd9d9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -9,7 +9,7 @@ pipeline { steps { sh ''' #!/usr/local/bin/bash rbenv local 3.2.2 - echo 'ENV["APP_SESSION_SECRET"] ||= $(ruby -rsecurerandom -e "puts SecureRandom.base64(64).inspect()")' > .env.rb + echo "ENV[\\\"APP_SESSION_SECRET\\\"] ||= $(ruby -rsecurerandom -e 'puts SecureRandom.base64(64).inspect()')" > .env.rb echo 'ENV["DB_NAME"] ||= "${DB_NAME}"' >> .env.rb ''' } -- 2.41.0 From 00119f97232d3f6ada77b2d5ec57a40d2502e266 Mon Sep 17 00:00:00 2001 From: Adam Townsend Date: Tue, 17 Oct 2023 21:32:30 -0700 Subject: [PATCH 3/7] use env.DB_NAME to access the environment variable --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index b0dd9d9..3985cef 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,7 +10,7 @@ pipeline { sh ''' #!/usr/local/bin/bash rbenv local 3.2.2 echo "ENV[\\\"APP_SESSION_SECRET\\\"] ||= $(ruby -rsecurerandom -e 'puts SecureRandom.base64(64).inspect()')" > .env.rb - echo 'ENV["DB_NAME"] ||= "${DB_NAME}"' >> .env.rb + echo 'ENV["DB_NAME"] ||= "${env.DB_NAME}"' >> .env.rb ''' } } -- 2.41.0 From 7bc1a852db21bf56e7c1120af65027da733ea041 Mon Sep 17 00:00:00 2001 From: Adam Townsend Date: Tue, 17 Oct 2023 21:36:56 -0700 Subject: [PATCH 4/7] swap quotes on the db name --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3985cef..5a840dc 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,7 +10,7 @@ pipeline { sh ''' #!/usr/local/bin/bash rbenv local 3.2.2 echo "ENV[\\\"APP_SESSION_SECRET\\\"] ||= $(ruby -rsecurerandom -e 'puts SecureRandom.base64(64).inspect()')" > .env.rb - echo 'ENV["DB_NAME"] ||= "${env.DB_NAME}"' >> .env.rb + echo "ENV["DB_NAME"] ||= '${env.DB_NAME}'" >> .env.rb ''' } } -- 2.41.0 From 2759880a53933eefbb18c354e21b7a005d826c90 Mon Sep 17 00:00:00 2001 From: Adam Townsend Date: Tue, 17 Oct 2023 21:37:45 -0700 Subject: [PATCH 5/7] remove env. --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 5a840dc..e9142b1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,7 +10,7 @@ pipeline { sh ''' #!/usr/local/bin/bash rbenv local 3.2.2 echo "ENV[\\\"APP_SESSION_SECRET\\\"] ||= $(ruby -rsecurerandom -e 'puts SecureRandom.base64(64).inspect()')" > .env.rb - echo "ENV["DB_NAME"] ||= '${env.DB_NAME}'" >> .env.rb + echo "ENV["DB_NAME"] ||= '${DB_NAME}'" >> .env.rb ''' } } -- 2.41.0 From 4e32f4a60d81aa084d25dc04c9da02eb7fbb829a Mon Sep 17 00:00:00 2001 From: Adam Townsend Date: Tue, 17 Oct 2023 21:39:15 -0700 Subject: [PATCH 6/7] use the escaped quotes for it to work correctly --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index e9142b1..671c5b7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,7 +10,7 @@ pipeline { sh ''' #!/usr/local/bin/bash rbenv local 3.2.2 echo "ENV[\\\"APP_SESSION_SECRET\\\"] ||= $(ruby -rsecurerandom -e 'puts SecureRandom.base64(64).inspect()')" > .env.rb - echo "ENV["DB_NAME"] ||= '${DB_NAME}'" >> .env.rb + echo "ENV[\\\"DB_NAME\\\"] ||= \\\"${DB_NAME}\\\"" >> .env.rb ''' } } -- 2.41.0 From 93aa007c14e805d24bfc244eb336ffd0dcaf99b7 Mon Sep 17 00:00:00 2001 From: Adam Townsend Date: Tue, 17 Oct 2023 21:40:39 -0700 Subject: [PATCH 7/7] removed secret.rb, it's no longer needed --- Jenkinsfile | 2 +- secret.rb | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) delete mode 100644 secret.rb diff --git a/Jenkinsfile b/Jenkinsfile index 671c5b7..7c16c8e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -53,7 +53,7 @@ pipeline { cp .env.rb /tmp/url-shortener/ cp .ruby-version /tmp/url-shortener/ cd /tmp/url-shortener - rm -rf features spec coverage db/*.db .git* Jenkinsfile *.html secret.rb + rm -rf features spec coverage db/*.db .git* Jenkinsfile *.html cd /tmp tar -czvf $ZIP_FILE url-shortener/ mv /tmp/$ZIP_FILE $CUR_DIR/ diff --git a/secret.rb b/secret.rb deleted file mode 100644 index 2672149..0000000 --- a/secret.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'securerandom' -puts SecureRandom.base64(64).inspect() -- 2.41.0