bucky
/
url-shortener
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Compare commits

base: bucky:10fe82ab6a77d6021e2abd97a623f4ca510bec63
Branches Tags
bucky:master
bucky:2023-10-15
...
compare: bucky:b3b886f0b3ee39c4266bd76d52fae6cec9afbb98
Branches Tags
bucky:master
bucky:2023-10-15

8 Commits
10fe82ab6a ... b3b886f0b3

Author SHA1 Message Date
bucky b3b886f0b3 Merge pull request 'simplify-secret' (#27) from simplify-secret into master 
Reviewed-on: #27
 2023-10-17 21:43:19 -07:00
Adam Townsend 93aa007c14 removed secret.rb, it's no longer needed 2023-10-17 21:40:39 -07:00
Adam Townsend 4e32f4a60d use the escaped quotes for it to work correctly 2023-10-17 21:39:15 -07:00
Adam Townsend 2759880a53 remove env. 2023-10-17 21:37:45 -07:00
Adam Townsend 7bc1a852db swap quotes on the db name 2023-10-17 21:36:56 -07:00
Adam Townsend 00119f9723 use env.DB_NAME to access the environment variable 2023-10-17 21:32:30 -07:00
Adam Townsend ff2a0e867d swap the quotes because single quotes doesn't exec the ruby command 2023-10-17 21:30:53 -07:00
Adam Townsend 1fae85ff9d moved the init step into one shell command to load it all, and don't use 
the secret.rb file
 2023-10-17 21:26:23 -07:00
2 changed files with 6 additions and 6 deletions
Show Stats Expand all files Collapse all files

10
Jenkinsfile vendored
View File

@ -7,9 +7,11 @@ pipeline {
stages { stages {
stage('Init') { stage('Init') {
steps { steps {
sh 'rbenv local 3.2.2' sh ''' #!/usr/local/bin/bash
sh 'echo "ENV[\\\"APP_SESSION_SECRET\\\"] ||= $(ruby secret.rb)" > .env.rb' rbenv local 3.2.2
sh 'echo "ENV[\\\"DB_NAME\\\"] ||= \\\"${DB_NAME}\\\"" >> .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
'''
} }
} }
stage('Build dependencies') { stage('Build dependencies') {
@ -51,7 +53,7 @@ pipeline {
cp .env.rb /tmp/url-shortener/ cp .env.rb /tmp/url-shortener/
cp .ruby-version /tmp/url-shortener/ cp .ruby-version /tmp/url-shortener/
cd /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 cd /tmp
tar -czvf $ZIP_FILE url-shortener/ tar -czvf $ZIP_FILE url-shortener/
mv /tmp/$ZIP_FILE $CUR_DIR/ mv /tmp/$ZIP_FILE $CUR_DIR/

2
secret.rb
View File

@ -1,2 +0,0 @@
require 'securerandom'
puts SecureRandom.base64(64).inspect()