diff --git a/.gitignore b/.gitignore index 549ed76..2124d21 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ .gradle **/build +.project +.settings/ \ No newline at end of file diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..5b0f619 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,14 @@ +FROM gradle:jdk10 + +USER root + +RUN apt-get install -y curl \ + && curl -sL https://deb.nodesource.com/setup_8.x | bash - \ + && apt-get install -y nodejs aspell awscli wkhtmltopdf python-pip ruby \ + && curl -L https://www.npmjs.com/install.sh | sh \ + && npm install -g hackmyresume \ + && pip install cfn-lint \ + && gem install cfn-nag + +USER gradle +WORKDIR /home/gradle/src diff --git a/Jenkinsfile b/Jenkinsfile index 5de755a..9917c7c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -6,6 +6,23 @@ simplePipelineWithInput( 'Deployed HTML + Print Preview Look Ok?', // artifacts that should be archived - 'resume/build/resume*' + 'resume/build/resume*', + + // docker builder args + + // un-privileged user + '-u gradle ' + \ + + // saved credentials for google drive publish + '-v $HOME/.credentials/google-drive-uploader:/home/gradle/.credentials/google-drive-uploader ' + \ + // local icloud dir for icloud drive publish + '-v "$HOME/Library/Mobile Documents/com~apple~CloudDocs:/home/gradle/Library/Mobile Documents/com~apple~CloudDocs" ' + \ + + // local AWS config and credentials + '-v $HOME/.aws:/home/gradle/.aws ' + \ + + // local gradle.properties + '-v $HOME/.gradle/gradle.properties:/home/gradle/.gradle/gradle.properties' + ) \ No newline at end of file diff --git a/README.md b/README.md index 4165a47..590a763 100644 --- a/README.md +++ b/README.md @@ -57,7 +57,7 @@ ext { wildcardCertARN = "arn:aws:acm:us-east-1:247631471946:certificate/471106fc-e3dd-4e0b-a20f-010a6e326283" // list of strings to check for in postdeploy check of deployed html resume - ensureStrings = ['John A. Carter', 'johncarter@warlordofmars.net', '(770) 598-7096'] + ensureStrings = ['John A. Carter', 'johncarter@warlordofmars.net', '(617) 334-5110'] // set stack name different if not promote stackName = isPromote ? 'ResumeWebsite' : 'ResumeWebsiteTest' diff --git a/build.gradle b/build.gradle index 243e856..c9471a5 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ buildscript { classpath 'com.github.warlordofmars:gradle-release-helper:release-0.1.3' classpath 'com.github.warlordofmars:gradle-slack-liveupdate:release-0.3.8' classpath 'com.github.warlordofmars:gradle-cloudformation-helper:release-0.1.6' - classpath 'com.github.warlordofmars:gradle-json-resume:release-0.1.9' + classpath 'com.github.warlordofmars:gradle-json-resume:release-0.1.11' } }