From 92ccf20860a678a564e7a5fa0974f1b2ecf95fbe Mon Sep 17 00:00:00 2001
From: Alexis Li <alexis.li@oicr.on.ca>
Date: Wed, 22 Jan 2020 13:46:19 -0500
Subject: [PATCH 1/5] Merge back to develop: 1.0.1-SNAPSHOT

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index e8ca6c4..74e6bc1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "swagger-combine",
-  "version": "1.0.1",
+  "version": "1.0.1-SNAPSHOT",
   "description": "A simple tool to shallow-merge two or more swagger 2.0 specs into one",
   "main": "merge.js",
   "author": "Alexis Li",

From 9a4893ed64f930699d341a50f516de63055f08fa Mon Sep 17 00:00:00 2001
From: Alexis Li <alexis.li@oicr.on.ca>
Date: Wed, 22 Jan 2020 13:53:00 -0500
Subject: [PATCH 2/5] Merge Back Develop: 1.0.2-SNAPSHOT

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 74e6bc1..92046d3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "swagger-combine",
-  "version": "1.0.1-SNAPSHOT",
+  "version": "1.0.2-SNAPSHOT",
   "description": "A simple tool to shallow-merge two or more swagger 2.0 specs into one",
   "main": "merge.js",
   "author": "Alexis Li",

From 860ccd29ac92c3ed6d19d5bbe291e1067e1c1514 Mon Sep 17 00:00:00 2001
From: Robert Tisma <942951+rtisma@users.noreply.github.com>
Date: Mon, 2 Mar 2020 16:49:30 -0500
Subject: [PATCH 3/5] 16-update-docker-security

---
 Dockerfile | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b3f1df4..68312cf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,22 @@
-FROM node:10
-WORKDIR /usr/src/app
-COPY package*.json ./
-RUN npm ci
+FROM node:10-alpine
+
 ENV NODE_ENV=production
 ENV HOST=localhost
+ENV APP_UID=9999
+ENV APP_GID=9999
+
+WORKDIR /usr/src/app
+
+COPY package*.json ./
+
+RUN apk --no-cache add shadow \
+   && groupmod -g $APP_GID node \
+   && usermod -u $APP_UID -g $APP_GID node \
+   && rm -rf /var/cache/apk/* \
+   && npm ci
+
 COPY . ./
+
+USER $APP_UID
+
 CMD node merge.js -o merged.json WES-swagger-template.json $WF_SEARCH_API $WF_MANAGEMENT_API && node app.js

From 6e9be234840df57f96c8374e33c867f31fa54ad8 Mon Sep 17 00:00:00 2001
From: rtisma <942951+rtisma@users.noreply.github.com>
Date: Tue, 3 Mar 2020 11:30:35 -0500
Subject: [PATCH 4/5] 16-update-docker-security

---
 Dockerfile | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 68312cf..b3a9883 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,19 +4,23 @@ ENV NODE_ENV=production
 ENV HOST=localhost
 ENV APP_UID=9999
 ENV APP_GID=9999
+ENV APP_USER=node
+ENV APP_HOME=/usr/src/app
 
-WORKDIR /usr/src/app
+WORKDIR $APP_HOME
 
 COPY package*.json ./
 
 RUN apk --no-cache add shadow \
-   && groupmod -g $APP_GID node \
-   && usermod -u $APP_UID -g $APP_GID node \
+   && groupmod -g $APP_GID $APP_USER \
+   && usermod -u $APP_UID -g $APP_GID $APP_USER \
+   && chown -R $APP_UID:$APP_GID $APP_HOME \
    && rm -rf /var/cache/apk/* \
    && npm ci
 
-COPY . ./
-
 USER $APP_UID
 
+COPY . ./
+
+EXPOSE 3000
 CMD node merge.js -o merged.json WES-swagger-template.json $WF_SEARCH_API $WF_MANAGEMENT_API && node app.js

From 737be0b6ed5b7d206faa799a4fcbcf7916266583 Mon Sep 17 00:00:00 2001
From: Robert Tisma <942951+rtisma@users.noreply.github.com>
Date: Mon, 9 Mar 2020 09:05:22 -0400
Subject: [PATCH 5/5] Release 1.1.0 - podSecurity

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 92046d3..98d179e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "swagger-combine",
-  "version": "1.0.2-SNAPSHOT",
+  "version": "1.1.0",
   "description": "A simple tool to shallow-merge two or more swagger 2.0 specs into one",
   "main": "merge.js",
   "author": "Alexis Li",