From 6e39f8c58e1b50f1d4402785ab308815ad65b6eb Mon Sep 17 00:00:00 2001
From: Cameron Cordes <cameronc.dev@gmail.com>
Date: Fri, 24 Dec 2021 10:33:26 -0500
Subject: [PATCH 1/6] Build from Dockerfile to improve caching

This should improve build times with changes that don't change the
dependencies in Cargo.toml.
---
 Dockerfile.ci | 4 ++++
 Jenkinsfile   | 6 +++---
 src/auth.rs   | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)
 create mode 100644 Dockerfile.ci

diff --git a/Dockerfile.ci b/Dockerfile.ci
new file mode 100644
index 0000000..2926f03
--- /dev/null
+++ b/Dockerfile.ci
@@ -0,0 +1,4 @@
+FROM rust:1.55
+COPY Cargo.toml .
+RUN cargo fetch
+COPY src/ ./src/
diff --git a/Jenkinsfile b/Jenkinsfile
index 3a8cb81..5f73615 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,8 +1,8 @@
 pipeline {
   agent {
-    docker {
-      image 'rust:1.55'
-      args '-v "$PWD":/usr/src/image-api'
+    dockerfile {
+      filename 'Dockerfile.ci'
+      args '-v "$PWD:/usr/src/image-api'
     }
   }
 
diff --git a/src/auth.rs b/src/auth.rs
index 5be9209..f8222f3 100644
--- a/src/auth.rs
+++ b/src/auth.rs
@@ -36,7 +36,7 @@ pub async fn login(
     if let Some(user) = user_dao.get_user(&creds.username, &creds.password) {
         let claims = Claims {
             sub: user.id.to_string(),
-            exp: (Utc::now() + Duration::days(5)).timestamp(),
+            exp: (Utc::now() + Duration::minutes(1)).timestamp(),
         };
         let token = encode(
             &Header::default(),
-- 
2.49.1


From d20a7e9c4d57bf0668c4f8f51449da7ec4a795ef Mon Sep 17 00:00:00 2001
From: Cameron Cordes <cameronc.dev@gmail.com>
Date: Fri, 24 Dec 2021 10:44:18 -0500
Subject: [PATCH 2/6] Make temporary main.rs for fetch

---
 Dockerfile.ci | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile.ci b/Dockerfile.ci
index 2926f03..755edef 100644
--- a/Dockerfile.ci
+++ b/Dockerfile.ci
@@ -1,4 +1,4 @@
 FROM rust:1.55
 COPY Cargo.toml .
-RUN cargo fetch
+RUN echo "fn main() {}" > ./src/main.rs && cargo fetch
 COPY src/ ./src/
-- 
2.49.1


From 90625e099e82b9eb52fa516795b80a78a724b5cc Mon Sep 17 00:00:00 2001
From: Cameron Cordes <cameronc.dev@gmail.com>
Date: Fri, 24 Dec 2021 10:45:35 -0500
Subject: [PATCH 3/6] Create src directory

---
 Dockerfile.ci | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile.ci b/Dockerfile.ci
index 755edef..948808b 100644
--- a/Dockerfile.ci
+++ b/Dockerfile.ci
@@ -1,4 +1,4 @@
 FROM rust:1.55
 COPY Cargo.toml .
-RUN echo "fn main() {}" > ./src/main.rs && cargo fetch
+RUN mkdir ./src && echo "fn main() {}" > ./src/main.rs && cargo fetch
 COPY src/ ./src/
-- 
2.49.1


From 44f9bcedbd7cca1a08baa18596e982f91d99a865 Mon Sep 17 00:00:00 2001
From: Cameron Cordes <cameronc.dev@gmail.com>
Date: Fri, 24 Dec 2021 11:02:34 -0500
Subject: [PATCH 4/6] Set User to fix permission issue

---
 Dockerfile.ci | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile.ci b/Dockerfile.ci
index 948808b..ab0d4c9 100644
--- a/Dockerfile.ci
+++ b/Dockerfile.ci
@@ -1,4 +1,5 @@
 FROM rust:1.55
+USER 1000:999
 COPY Cargo.toml .
 RUN mkdir ./src && echo "fn main() {}" > ./src/main.rs && cargo fetch
 COPY src/ ./src/
-- 
2.49.1


From 5a965d766b4c6f700a430eff305f16a86a4245c8 Mon Sep 17 00:00:00 2001
From: Cameron Cordes <cameronc.dev@gmail.com>
Date: Fri, 24 Dec 2021 11:05:06 -0500
Subject: [PATCH 5/6] Update working directory

---
 Dockerfile.ci | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile.ci b/Dockerfile.ci
index ab0d4c9..9ae33b2 100644
--- a/Dockerfile.ci
+++ b/Dockerfile.ci
@@ -1,5 +1,6 @@
 FROM rust:1.55
 USER 1000:999
+WORKDIR /usr/src/image-api
 COPY Cargo.toml .
 RUN mkdir ./src && echo "fn main() {}" > ./src/main.rs && cargo fetch
 COPY src/ ./src/
-- 
2.49.1


From 99dbc6577e96576243b6d30422532a875f4a5d5d Mon Sep 17 00:00:00 2001
From: Cameron Cordes <cameronc.dev@gmail.com>
Date: Fri, 24 Dec 2021 13:20:43 -0500
Subject: [PATCH 6/6] Fix build directory permissions

---
 Dockerfile.ci | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile.ci b/Dockerfile.ci
index 9ae33b2..0cf5bcc 100644
--- a/Dockerfile.ci
+++ b/Dockerfile.ci
@@ -1,4 +1,5 @@
 FROM rust:1.55
+RUN mkdir /usr/src/image-api && chown -R 1000:999 /usr/src/image-api
 USER 1000:999
 WORKDIR /usr/src/image-api
 COPY Cargo.toml .
-- 
2.49.1