From 8112f73efa773bc6412569f4540363bc4edf9667 Mon Sep 17 00:00:00 2001
From: John Carter <johncarter@warlordofmars.net>
Date: Wed, 13 Mar 2019 17:49:56 -0400
Subject: [PATCH 01/21] basic dockerfile for jenkins builder

---
 Dockerfile   | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 build.gradle | 28 +++++++++++++++++++++++++++-
 2 files changed, 77 insertions(+), 1 deletion(-)
 create mode 100644 Dockerfile

diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..640d9db
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,50 @@
+# FROM amazonlinux:2
+
+# RUN echo $' \
+# public class Hello { \
+# public static void main(String[] args) { \
+# System.out.println("Welcome to Amazon Corretto!"); \
+# } \
+# }' > Hello.java
+# RUN javac Hello.java
+
+
+
+# RUN yum update -y
+# RUN amazon-linux-extras enable corretto8
+# RUN yum install -y java-1.8.0-amazon-corretto
+
+# COPY . .
+
+# ENV JAVA_HOME /usr/lib/jvm/java-1.8.0-amazon-corretto.x86_64/jre/
+
+# RUN ["./gradlew", "help", "--console=plain", "-i"] 
+
+FROM gradle:jdk10
+
+USER root
+
+RUN apt-get install -y curl \
+  && curl -sL https://deb.nodesource.com/setup_9.x | bash - \
+  && apt-get install -y nodejs \
+  && curl -L https://www.npmjs.com/install.sh | sh 
+
+RUN npm install -g hackmyresume
+RUN apt-get install -y aspell
+RUN echo "exit 0" > /usr/bin/lp; chmod +x /usr/bin/lp
+RUN apt-get install -y awscli
+RUN apt-get install -y wkhtmltopdf
+# RUN echo "exit 0" > /usr/bin/gdrive; chmod +x /usr/bin/gdrive
+RUN apt-get install -y python-pip
+RUN pip install cfn-lint
+RUN apt-get install -y ruby
+RUN gem install cfn-nag
+
+RUN apt-get install -y golang
+RUN go get github.com/prasmussen/gdrive
+RUN cp /root/go/bin/gdrive /usr/bin/gdrive
+
+USER gradle
+COPY --chown=gradle:gradle . /home/gradle/src
+WORKDIR /home/gradle/src
+# RUN ./gradlew build
diff --git a/build.gradle b/build.gradle
index 243e856..3d1d974 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:0.1.9'
     }
 }
 
@@ -43,3 +43,29 @@ ext {
     websitePrefix = isPromote ? '' : "/${version}"
 
 }
+
+task('dockerBuild') {
+    doLast {
+        exec {
+            commandLine 'docker', 'build', '-t', 'resume-builder', '.'
+        }
+    }
+}
+
+task('containedBuild') {
+    dependsOn dockerBuild
+    doLast {
+        exec {
+            commandLine 'docker', 'run', '-v', "${System.env['HOME']}/.m2:/home/gradle/.m2", '-v', "${System.env['HOME']}/.aws:/home/gradle/.aws", '-v', "${System.env['HOME']}/.gradle:/home/gradle/.gradle", '-v', "${projectDir}:/home/gradle/src", 'resume-builder', 'sh', '-c', './gradlew build'
+        }
+    }
+}
+
+task('containedDeploy') {
+    mustRunAfter containedBuild
+    doLast {
+        exec {
+            commandLine 'docker', 'run', '-v', "${System.env['HOME']}/.m2:/home/gradle/.m2", '-v', "${System.env.HOME}/Library/Mobile Documents/com~apple~CloudDocs:/home/gradle/Library/Mobile Documents/com~apple~CloudDocs", '-v', "${System.env['HOME']}/.gdrive:/home/gradle/.gdrive", '-v', "${System.env['HOME']}/.aws:/home/gradle/.aws", '-v', "${System.env['HOME']}/.gradle:/home/gradle/.gradle", '-v', "${projectDir}:/home/gradle/src", 'resume-builder', 'sh', '-c', './gradlew deploy'
+        }
+    }
+}

From acb310bb2984692a7d404ac75c7f41aaacbd5757 Mon Sep 17 00:00:00 2001
From: John Carter <johncarter@warlordofmars.net>
Date: Wed, 13 Mar 2019 17:55:27 -0400
Subject: [PATCH 02/21] jenkinsfile for docker build

---
 Jenkinsfile | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 5de755a..ecc9c59 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -6,6 +6,13 @@ simplePipelineWithInput(
   'Deployed HTML + Print Preview Look Ok?',
   
   // artifacts that should be archived
-  'resume/build/resume*'
+  'resume/build/resume*',
+
+  // docker builder label
+  'resume-builder',
+
+  // docker builder args
+  "'-v', '${System.env['HOME']}/.m2:/home/gradle/.m2', '-v', '${System.env['HOME']}/.aws:/home/gradle/.aws', '-v', '${System.env['HOME']}/.gradle:/home/gradle/.gradle', '-v', '${workspace}:/home/gradle/src'
+
   
 )
\ No newline at end of file

From a4919fd1f0e3cf7d7280ec019cce552e623e29b8 Mon Sep 17 00:00:00 2001
From: John Carter <johncarter@warlordofmars.net>
Date: Wed, 13 Mar 2019 17:57:58 -0400
Subject: [PATCH 03/21] missing quote

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

diff --git a/Jenkinsfile b/Jenkinsfile
index ecc9c59..c968e59 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -12,7 +12,7 @@ simplePipelineWithInput(
   'resume-builder',
 
   // docker builder args
-  "'-v', '${System.env['HOME']}/.m2:/home/gradle/.m2', '-v', '${System.env['HOME']}/.aws:/home/gradle/.aws', '-v', '${System.env['HOME']}/.gradle:/home/gradle/.gradle', '-v', '${workspace}:/home/gradle/src'
+  "'-v', '${System.env['HOME']}/.m2:/home/gradle/.m2', '-v', '${System.env['HOME']}/.aws:/home/gradle/.aws', '-v', '${System.env['HOME']}/.gradle:/home/gradle/.gradle', '-v', '${workspace}:/home/gradle/src'"
 
   
 )
\ No newline at end of file

From fa48828cc19ddbfa2f5cbfa0e6d291d696337af8 Mon Sep 17 00:00:00 2001
From: John Carter <johncarter@warlordofmars.net>
Date: Wed, 13 Mar 2019 18:01:49 -0400
Subject: [PATCH 04/21] fixing

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

diff --git a/Jenkinsfile b/Jenkinsfile
index c968e59..ebf0cf4 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -12,7 +12,7 @@ simplePipelineWithInput(
   'resume-builder',
 
   // docker builder args
-  "'-v', '${System.env['HOME']}/.m2:/home/gradle/.m2', '-v', '${System.env['HOME']}/.aws:/home/gradle/.aws', '-v', '${System.env['HOME']}/.gradle:/home/gradle/.gradle', '-v', '${workspace}:/home/gradle/src'"
+  "-v ${env.HOME}/.m2:/home/gradle/.m2 -v '${env.HOME}/.aws:/home/gradle/.aws -v ${env.HOME}/.gradle:/home/gradle/.gradle -v ${env.WORKSPACE}:/home/gradle/src"
 
   
 )
\ No newline at end of file

From 7e0390364c4e4022027a56dc227ad3267e7cddac Mon Sep 17 00:00:00 2001
From: John Carter <johncarter@warlordofmars.net>
Date: Wed, 13 Mar 2019 18:05:52 -0400
Subject: [PATCH 05/21] fixing

---
 Jenkinsfile | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index ebf0cf4..8124fd8 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -8,9 +8,6 @@ simplePipelineWithInput(
   // artifacts that should be archived
   'resume/build/resume*',
 
-  // docker builder label
-  'resume-builder',
-
   // docker builder args
   "-v ${env.HOME}/.m2:/home/gradle/.m2 -v '${env.HOME}/.aws:/home/gradle/.aws -v ${env.HOME}/.gradle:/home/gradle/.gradle -v ${env.WORKSPACE}:/home/gradle/src"
 

From 880c2abc8a6eb456ebea3a9c312d3874a114f4c9 Mon Sep 17 00:00:00 2001
From: John Carter <johncarter@warlordofmars.net>
Date: Thu, 14 Mar 2019 12:03:13 -0400
Subject: [PATCH 06/21] updating docker builder args

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

diff --git a/Jenkinsfile b/Jenkinsfile
index 8124fd8..c4312ce 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -9,7 +9,7 @@ simplePipelineWithInput(
   'resume/build/resume*',
 
   // docker builder args
-  "-v ${env.HOME}/.m2:/home/gradle/.m2 -v '${env.HOME}/.aws:/home/gradle/.aws -v ${env.HOME}/.gradle:/home/gradle/.gradle -v ${env.WORKSPACE}:/home/gradle/src"
+  '-v $HOME/.m2:/home/gradle/.m2 -v $HOME/.aws:/home/gradle/.aws -v $HOME/.gradle:/home/gradle/.gradle -v .:/home/gradle/src'
 
   
 )
\ No newline at end of file

From 2264a04e8d38e4971e2215924988ad100c72ec2b Mon Sep 17 00:00:00 2001
From: John Carter <johncarter@warlordofmars.net>
Date: Thu, 14 Mar 2019 12:04:11 -0400
Subject: [PATCH 07/21] updating docker builder args

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

diff --git a/Jenkinsfile b/Jenkinsfile
index c4312ce..2f9410d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -9,7 +9,7 @@ simplePipelineWithInput(
   'resume/build/resume*',
 
   // docker builder args
-  '-v $HOME/.m2:/home/gradle/.m2 -v $HOME/.aws:/home/gradle/.aws -v $HOME/.gradle:/home/gradle/.gradle -v .:/home/gradle/src'
+  '-v $HOME/.m2:/home/gradle/.m2 -v $HOME/.aws:/home/gradle/.aws -v $HOME/.gradle:/home/gradle/.gradle'
 
   
 )
\ No newline at end of file

From 02a7ef21904effc864160def3dcd2119c179caad Mon Sep 17 00:00:00 2001
From: John Carter <johncarter@warlordofmars.net>
Date: Thu, 14 Mar 2019 12:07:46 -0400
Subject: [PATCH 08/21] reverting gradle-json-resume update

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

diff --git a/build.gradle b/build.gradle
index 3d1d974..4c5e545 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:0.1.9'
+        classpath 'com.github.warlordofmars:gradle-json-resume:release-0.1.9'
     }
 }
 

From ca2ba54ea6d1843fc74a7039e7204a33788c0b4c Mon Sep 17 00:00:00 2001
From: John Carter <johncarter@warlordofmars.net>
Date: Thu, 14 Mar 2019 12:23:22 -0400
Subject: [PATCH 09/21] forcing docker builder user as gradle

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

diff --git a/Jenkinsfile b/Jenkinsfile
index 2f9410d..7f83536 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -9,7 +9,7 @@ simplePipelineWithInput(
   'resume/build/resume*',
 
   // docker builder args
-  '-v $HOME/.m2:/home/gradle/.m2 -v $HOME/.aws:/home/gradle/.aws -v $HOME/.gradle:/home/gradle/.gradle'
+  '-u gradle -v $HOME/.m2:/home/gradle/.m2 -v $HOME/.aws:/home/gradle/.aws -v $HOME/.gradle:/home/gradle/.gradle'
 
   
 )
\ No newline at end of file

From aaf155cf7e87e9c4b61c54d39201cca2cbc45f59 Mon Sep 17 00:00:00 2001
From: John Carter <johncarter@warlordofmars.net>
Date: Thu, 14 Mar 2019 12:29:26 -0400
Subject: [PATCH 10/21] only share gradle.properties w/ docker builder

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

diff --git a/Jenkinsfile b/Jenkinsfile
index 7f83536..6ed0a62 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -9,7 +9,7 @@ simplePipelineWithInput(
   'resume/build/resume*',
 
   // docker builder args
-  '-u gradle -v $HOME/.m2:/home/gradle/.m2 -v $HOME/.aws:/home/gradle/.aws -v $HOME/.gradle:/home/gradle/.gradle'
+  '-u gradle -v $HOME/.m2:/home/gradle/.m2 -v $HOME/.aws:/home/gradle/.aws -v $HOME/.gradle/gradle.properties:/home/gradle/.gradle/gradle.properties'
 
   
 )
\ No newline at end of file

From eaf51abc7ce981c0bb3e5be58fb9fe7ead9fd175 Mon Sep 17 00:00:00 2001
From: John Carter <johncarter@warlordofmars.net>
Date: Thu, 14 Mar 2019 12:55:29 -0400
Subject: [PATCH 11/21] adding icloud + gdrive dirs to docker builder volumes

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

diff --git a/Jenkinsfile b/Jenkinsfile
index 6ed0a62..066f4c4 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -9,7 +9,7 @@ simplePipelineWithInput(
   'resume/build/resume*',
 
   // docker builder args
-  '-u gradle -v $HOME/.m2:/home/gradle/.m2 -v $HOME/.aws:/home/gradle/.aws -v $HOME/.gradle/gradle.properties:/home/gradle/.gradle/gradle.properties'
+  '-u gradle -v $HOME/Library/Mobile\ Documents/com~apple~CloudDocs:/home/gradle/Library/Mobile\ Documents/com~apple~CloudDocs -v $HOME/.gdrive:/home/gradle/.gdrive -v $HOME/.m2:/home/gradle/.m2 -v $HOME/.aws:/home/gradle/.aws -v $HOME/.gradle/gradle.properties:/home/gradle/.gradle/gradle.properties'
 
   
 )
\ No newline at end of file

From bce00e49b85420ca50c178ffede175484f8aa9aa Mon Sep 17 00:00:00 2001
From: John Carter <johncarter@warlordofmars.net>
Date: Thu, 14 Mar 2019 12:56:46 -0400
Subject: [PATCH 12/21] bad slashes

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

diff --git a/Jenkinsfile b/Jenkinsfile
index 066f4c4..85eac15 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -9,7 +9,7 @@ simplePipelineWithInput(
   'resume/build/resume*',
 
   // docker builder args
-  '-u gradle -v $HOME/Library/Mobile\ Documents/com~apple~CloudDocs:/home/gradle/Library/Mobile\ Documents/com~apple~CloudDocs -v $HOME/.gdrive:/home/gradle/.gdrive -v $HOME/.m2:/home/gradle/.m2 -v $HOME/.aws:/home/gradle/.aws -v $HOME/.gradle/gradle.properties:/home/gradle/.gradle/gradle.properties'
+  '-u gradle -v $HOME/Library/Mobile Documents/com~apple~CloudDocs:/home/gradle/Library/Mobile Documents/com~apple~CloudDocs -v $HOME/.gdrive:/home/gradle/.gdrive -v $HOME/.m2:/home/gradle/.m2 -v $HOME/.aws:/home/gradle/.aws -v $HOME/.gradle/gradle.properties:/home/gradle/.gradle/gradle.properties'
 
   
 )
\ No newline at end of file

From 098a94710470c781b24ee93ea9c72746c779b315 Mon Sep 17 00:00:00 2001
From: John Carter <johncarter@warlordofmars.net>
Date: Thu, 14 Mar 2019 12:58:17 -0400
Subject: [PATCH 13/21] maybe quotes

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

diff --git a/Jenkinsfile b/Jenkinsfile
index 85eac15..dde0851 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -9,7 +9,7 @@ simplePipelineWithInput(
   'resume/build/resume*',
 
   // docker builder args
-  '-u gradle -v $HOME/Library/Mobile Documents/com~apple~CloudDocs:/home/gradle/Library/Mobile Documents/com~apple~CloudDocs -v $HOME/.gdrive:/home/gradle/.gdrive -v $HOME/.m2:/home/gradle/.m2 -v $HOME/.aws:/home/gradle/.aws -v $HOME/.gradle/gradle.properties:/home/gradle/.gradle/gradle.properties'
+  '-u gradle -v "$HOME/Library/Mobile Documents/com~apple~CloudDocs:/home/gradle/Library/Mobile Documents/com~apple~CloudDocs" -v $HOME/.gdrive:/home/gradle/.gdrive -v $HOME/.m2:/home/gradle/.m2 -v $HOME/.aws:/home/gradle/.aws -v $HOME/.gradle/gradle.properties:/home/gradle/.gradle/gradle.properties'
 
   
 )
\ No newline at end of file

From ed4166aa869c87549b3325ff97b8740554430dd8 Mon Sep 17 00:00:00 2001
From: John Carter <johncarter@warlordofmars.net>
Date: Thu, 14 Mar 2019 13:01:17 -0400
Subject: [PATCH 14/21] back to custom gradle-json-resume plugin

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

diff --git a/build.gradle b/build.gradle
index 4c5e545..3d1d974 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:0.1.9'
     }
 }
 

From 8ffacb0c317954cb1a5d038ff6789ed151c682ef Mon Sep 17 00:00:00 2001
From: John Carter <johncarter@warlordofmars.net>
Date: Thu, 14 Mar 2019 15:21:26 -0400
Subject: [PATCH 15/21] hard coding home dir for now :-(

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

diff --git a/Jenkinsfile b/Jenkinsfile
index dde0851..747f192 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -9,7 +9,7 @@ simplePipelineWithInput(
   'resume/build/resume*',
 
   // docker builder args
-  '-u gradle -v "$HOME/Library/Mobile Documents/com~apple~CloudDocs:/home/gradle/Library/Mobile Documents/com~apple~CloudDocs" -v $HOME/.gdrive:/home/gradle/.gdrive -v $HOME/.m2:/home/gradle/.m2 -v $HOME/.aws:/home/gradle/.aws -v $HOME/.gradle/gradle.properties:/home/gradle/.gradle/gradle.properties'
+  '-u gradle -v "/Users/john/Library/Mobile Documents/com~apple~CloudDocs:/home/gradle/Library/Mobile Documents/com~apple~CloudDocs" -v /Users/john/.gdrive:/home/gradle/.gdrive -v /Users/john/.m2:/home/gradle/.m2 -v /Users/john/.aws:/home/gradle/.aws -v /Users/john/.gradle/gradle.properties:/home/gradle/.gradle/gradle.properties'
 
   
 )
\ No newline at end of file

From f0e7c130d2a549fde3ddfe04c50f1304c9cf2b47 Mon Sep 17 00:00:00 2001
From: John Carter <johncarter@warlordofmars.net>
Date: Fri, 15 Mar 2019 13:48:00 -0400
Subject: [PATCH 16/21] adding google creditials mount for docker builder

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

diff --git a/Jenkinsfile b/Jenkinsfile
index 747f192..cd3386e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -9,7 +9,7 @@ simplePipelineWithInput(
   'resume/build/resume*',
 
   // docker builder args
-  '-u gradle -v "/Users/john/Library/Mobile Documents/com~apple~CloudDocs:/home/gradle/Library/Mobile Documents/com~apple~CloudDocs" -v /Users/john/.gdrive:/home/gradle/.gdrive -v /Users/john/.m2:/home/gradle/.m2 -v /Users/john/.aws:/home/gradle/.aws -v /Users/john/.gradle/gradle.properties:/home/gradle/.gradle/gradle.properties'
+  '-u gradle -v $HOME/.credentials/google-drive-uploader:/home/gradle/.credentials/google-drive-uploader -v "$HOME/Library/Mobile Documents/com~apple~CloudDocs:/home/gradle/Library/Mobile Documents/com~apple~CloudDocs" -v $HOME/.gdrive:/home/gradle/.gdrive -v $HOME/.m2:/home/gradle/.m2 -v $HOME/.aws:/home/gradle/.aws -v $HOME/.gradle/gradle.properties:/home/gradle/.gradle/gradle.properties'
 
   
 )
\ No newline at end of file

From 25f789075506073df262ebc1176666acce687b63 Mon Sep 17 00:00:00 2001
From: John Carter <johncarter@warlordofmars.net>
Date: Fri, 15 Mar 2019 14:07:09 -0400
Subject: [PATCH 17/21] Dockerfile cleanup / optimization

---
 Dockerfile | 48 ++++++------------------------------------------
 1 file changed, 6 insertions(+), 42 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 640d9db..5b0f619 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,50 +1,14 @@
-# FROM amazonlinux:2
-
-# RUN echo $' \
-# public class Hello { \
-# public static void main(String[] args) { \
-# System.out.println("Welcome to Amazon Corretto!"); \
-# } \
-# }' > Hello.java
-# RUN javac Hello.java
-
-
-
-# RUN yum update -y
-# RUN amazon-linux-extras enable corretto8
-# RUN yum install -y java-1.8.0-amazon-corretto
-
-# COPY . .
-
-# ENV JAVA_HOME /usr/lib/jvm/java-1.8.0-amazon-corretto.x86_64/jre/
-
-# RUN ["./gradlew", "help", "--console=plain", "-i"] 
-
 FROM gradle:jdk10
 
 USER root
 
 RUN apt-get install -y curl \
-  && curl -sL https://deb.nodesource.com/setup_9.x | bash - \
-  && apt-get install -y nodejs \
-  && curl -L https://www.npmjs.com/install.sh | sh 
-
-RUN npm install -g hackmyresume
-RUN apt-get install -y aspell
-RUN echo "exit 0" > /usr/bin/lp; chmod +x /usr/bin/lp
-RUN apt-get install -y awscli
-RUN apt-get install -y wkhtmltopdf
-# RUN echo "exit 0" > /usr/bin/gdrive; chmod +x /usr/bin/gdrive
-RUN apt-get install -y python-pip
-RUN pip install cfn-lint
-RUN apt-get install -y ruby
-RUN gem install cfn-nag
-
-RUN apt-get install -y golang
-RUN go get github.com/prasmussen/gdrive
-RUN cp /root/go/bin/gdrive /usr/bin/gdrive
+  && 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
-COPY --chown=gradle:gradle . /home/gradle/src
 WORKDIR /home/gradle/src
-# RUN ./gradlew build

From d84c876c8524341222cec99a7fca60816bb2477a Mon Sep 17 00:00:00 2001
From: John Carter <johncarter@warlordofmars.net>
Date: Fri, 15 Mar 2019 15:14:23 -0400
Subject: [PATCH 18/21] Jenkinsfile cleanup and comments

---
 Jenkinsfile | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index cd3386e..c163cc2 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -9,7 +9,24 @@ simplePipelineWithInput(
   'resume/build/resume*',
 
   // docker builder args
-  '-u gradle -v $HOME/.credentials/google-drive-uploader:/home/gradle/.credentials/google-drive-uploader -v "$HOME/Library/Mobile Documents/com~apple~CloudDocs:/home/gradle/Library/Mobile Documents/com~apple~CloudDocs" -v $HOME/.gdrive:/home/gradle/.gdrive -v $HOME/.m2:/home/gradle/.m2 -v $HOME/.aws:/home/gradle/.aws -v $HOME/.gradle/gradle.properties:/home/gradle/.gradle/gradle.properties'
+  
+  // 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" ' + \
   
+  // TODO: remove this
+  // local maven repo for testing SNAPSHOT versions
+  '-v $HOME/.m2:/home/gradle/.m2 ' + \
+
+  // 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

From e48ffb0fead28a947bea9e6fc33f934d8344101c Mon Sep 17 00:00:00 2001
From: John Carter <johncarter@warlordofmars.net>
Date: Fri, 15 Mar 2019 15:15:30 -0400
Subject: [PATCH 19/21] updating .gitignore for vscode settings + project
 configs

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

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

From 5edc63742d0ad53de035dece4cbc78cbcc887d2e Mon Sep 17 00:00:00 2001
From: John Carter <johncarter@warlordofmars.net>
Date: Fri, 15 Mar 2019 15:40:39 -0400
Subject: [PATCH 20/21] updating to release gradle-json-resume version

---
 README.md    |  2 +-
 build.gradle | 28 +---------------------------
 2 files changed, 2 insertions(+), 28 deletions(-)

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 3d1d974..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:0.1.9'
+        classpath 'com.github.warlordofmars:gradle-json-resume:release-0.1.11'
     }
 }
 
@@ -43,29 +43,3 @@ ext {
     websitePrefix = isPromote ? '' : "/${version}"
 
 }
-
-task('dockerBuild') {
-    doLast {
-        exec {
-            commandLine 'docker', 'build', '-t', 'resume-builder', '.'
-        }
-    }
-}
-
-task('containedBuild') {
-    dependsOn dockerBuild
-    doLast {
-        exec {
-            commandLine 'docker', 'run', '-v', "${System.env['HOME']}/.m2:/home/gradle/.m2", '-v', "${System.env['HOME']}/.aws:/home/gradle/.aws", '-v', "${System.env['HOME']}/.gradle:/home/gradle/.gradle", '-v', "${projectDir}:/home/gradle/src", 'resume-builder', 'sh', '-c', './gradlew build'
-        }
-    }
-}
-
-task('containedDeploy') {
-    mustRunAfter containedBuild
-    doLast {
-        exec {
-            commandLine 'docker', 'run', '-v', "${System.env['HOME']}/.m2:/home/gradle/.m2", '-v', "${System.env.HOME}/Library/Mobile Documents/com~apple~CloudDocs:/home/gradle/Library/Mobile Documents/com~apple~CloudDocs", '-v', "${System.env['HOME']}/.gdrive:/home/gradle/.gdrive", '-v', "${System.env['HOME']}/.aws:/home/gradle/.aws", '-v', "${System.env['HOME']}/.gradle:/home/gradle/.gradle", '-v', "${projectDir}:/home/gradle/src", 'resume-builder', 'sh', '-c', './gradlew deploy'
-        }
-    }
-}

From 59640e19a35251062b4945855a6db63313393595 Mon Sep 17 00:00:00 2001
From: John Carter <johncarter@warlordofmars.net>
Date: Sat, 16 Mar 2019 11:11:57 -0400
Subject: [PATCH 21/21] removing local maven repo as docker builder mount

---
 Jenkinsfile | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index c163cc2..9917c7c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -19,10 +19,6 @@ simplePipelineWithInput(
   // local icloud dir for icloud drive publish
   '-v "$HOME/Library/Mobile Documents/com~apple~CloudDocs:/home/gradle/Library/Mobile Documents/com~apple~CloudDocs" ' + \
   
-  // TODO: remove this
-  // local maven repo for testing SNAPSHOT versions
-  '-v $HOME/.m2:/home/gradle/.m2 ' + \
-
   // local AWS config and credentials
   '-v $HOME/.aws:/home/gradle/.aws ' + \