From 120c2e96e147c81ee809b08d541ebe828ef2d0d3 Mon Sep 17 00:00:00 2001
From: Kane Valentine <kane@cute.im>
Date: Fri, 26 Apr 2019 19:31:48 +0100
Subject: [PATCH 1/9] remove redundant 'mkdir' layer from Dockerfile

---
 Dockerfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index ba5cd79..33206bc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,5 @@
 FROM node:8.4
 
-RUN mkdir -p /opt/camo/
 WORKDIR /opt/camo/
 
 ADD package.json /opt/camo/

From 8d04c96fb8bb71adef1568aa8b94b6438e2ed5fa Mon Sep 17 00:00:00 2001
From: Kane Valentine <kane@cute.im>
Date: Fri, 26 Apr 2019 19:36:51 +0100
Subject: [PATCH 2/9] add .dockerignore file + remove unnecessary ADD layers
 from Dockerfile

---
 .dockerignore | 5 +++++
 Dockerfile    | 5 +----
 2 files changed, 6 insertions(+), 4 deletions(-)
 create mode 100644 .dockerignore

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..860a47e
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,5 @@
+# Ignore everything except for the files required to run Camo
+**
+!mime-types.json
+!package.json
+!server.js
diff --git a/Dockerfile b/Dockerfile
index 33206bc..40534f4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,7 @@
 FROM node:8.4
 
 WORKDIR /opt/camo/
-
-ADD package.json /opt/camo/
-ADD server.js /opt/camo/
-ADD mime-types.json /opt/camo/
+ADD ${PWD} /opt/camo/
 
 EXPOSE 8081
 

From 9729972726f9944b0c10ce8b9bb53654c22c0972 Mon Sep 17 00:00:00 2001
From: Kane Valentine <kane@cute.im>
Date: Fri, 26 Apr 2019 19:38:09 +0100
Subject: [PATCH 3/9] Base image from Alpine to greatly reduce image size

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

diff --git a/Dockerfile b/Dockerfile
index 40534f4..c40f328 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:8.4
+FROM node:8.4-alpine
 
 WORKDIR /opt/camo/
 ADD ${PWD} /opt/camo/

From ccaacf5d435677bad86f77710c3835db68edf262 Mon Sep 17 00:00:00 2001
From: Kane Valentine <kane@cute.im>
Date: Fri, 26 Apr 2019 21:26:05 +0100
Subject: [PATCH 4/9] bump node version to 8.9 LTS

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

diff --git a/Dockerfile b/Dockerfile
index c40f328..c813d07 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:8.4-alpine
+FROM node:8.9-alpine
 
 WORKDIR /opt/camo/
 ADD ${PWD} /opt/camo/

From e4c7046c14748e6827a934db4acc4db142a174d5 Mon Sep 17 00:00:00 2001
From: Kane Valentine <kane@cute.im>
Date: Sun, 28 Apr 2019 00:11:24 +0100
Subject: [PATCH 5/9] more Dockerfile best practice improvments + node v10
 (tested)

---
 Dockerfile | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c813d07..401635b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,9 @@
-FROM node:8.9-alpine
+FROM node:10.15.3-alpine
 
 WORKDIR /opt/camo/
-ADD ${PWD} /opt/camo/
+COPY ${PWD} /opt/camo/
 
-EXPOSE 8081
+RUN npm install && npm cache clean --force
 
-RUN npm install
-USER nobody
-CMD ["npm", "start"]
+EXPOSE 8081
+CMD ["node", "server.js"]

From cda89c58b2fc0c802e8e85058a7d7df28ddd5cc1 Mon Sep 17 00:00:00 2001
From: Kane Valentine <kane@cute.im>
Date: Sun, 28 Apr 2019 00:11:53 +0100
Subject: [PATCH 6/9] add missing attributes that npm complains about

---
 package.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 7fa7b39..e6d49de 100644
--- a/package.json
+++ b/package.json
@@ -1,11 +1,14 @@
 {
   "name": "camo",
+  "description": "An http proxy to route images through SSL.",
   "version": "2.3.0",
+  "repository": "git@github.com:atmos/camo.git",
+  "license": "MIT",
   "dependencies": {},
   "engines": {
     "node": "^6.11.1"
   },
   "devDependencies": {
-    "coffee-script": "^1.12.6"
+    "coffeescript": "^1.12.6"
   }
 }

From 1aab28b3fecf87b0b82eda0c8232009f7f3ee6b3 Mon Sep 17 00:00:00 2001
From: Kane Valentine <kane@cute.im>
Date: Sun, 28 Apr 2019 00:45:07 +0100
Subject: [PATCH 7/9] use node user provided by official base image

---
 Dockerfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index 401635b..bf62403 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,4 +6,6 @@ COPY ${PWD} /opt/camo/
 RUN npm install && npm cache clean --force
 
 EXPOSE 8081
+
+USER node
 CMD ["node", "server.js"]

From fe876ff7a2329239a7542387b1fa19767d5e8d99 Mon Sep 17 00:00:00 2001
From: Kane Valentine <kane@cute.im>
Date: Thu, 20 Jun 2019 10:03:41 +0100
Subject: [PATCH 8/9] use node:10-alpine image as base

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

diff --git a/Dockerfile b/Dockerfile
index bf62403..308dca6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:10.15.3-alpine
+FROM node:10-alpine
 
 WORKDIR /opt/camo/
 COPY ${PWD} /opt/camo/

From 80ee77c3b0bbdf9cbbfaed4039cb89d2083907e4 Mon Sep 17 00:00:00 2001
From: Kane Valentine <kane@cute.im>
Date: Sat, 23 May 2020 05:06:15 +0100
Subject: [PATCH 9/9] update base image node version

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

diff --git a/Dockerfile b/Dockerfile
index 308dca6..0b80f3f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:10-alpine
+FROM node:14-alpine
 
 WORKDIR /opt/camo/
 COPY ${PWD} /opt/camo/