From 1df4ef4b0faace6023c070a3909d1fe6e0a836ca Mon Sep 17 00:00:00 2001
From: Mark Wylde <markwylde@users.noreply.github.com>
Date: Sun, 30 May 2021 16:46:17 +1000
Subject: [PATCH] v6.0.3 (#55)

* Upgrade dependencies; Add openssl to docker image;

* 6.0.3
---
 Dockerfile        |  5 +++++
 package-lock.json | 24 ++++++++++++------------
 package.json      |  6 +++---
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 3588f29..cb07f68 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,6 +2,10 @@ FROM node:14-alpine
 
 WORKDIR /app
 
+RUN apk upgrade --update-cache --available && \
+    apk add openssl && \
+    rm -rf /var/cache/apk/*
+
 COPY package.json package.json
 COPY package-lock.json package-lock.json
 
@@ -13,3 +17,4 @@ COPY . .
 RUN ln -s /app/lib/cli.js /bin/canhazdb
 
 ENTRYPOINT ["canhazdb"]
+
diff --git a/package-lock.json b/package-lock.json
index 9501425..54e659b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "canhazdb-server",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -480,9 +480,9 @@
       }
     },
     "npm": {
-      "version": "7.14.0",
-      "resolved": "https://registry.npmjs.org/npm/-/npm-7.14.0.tgz",
-      "integrity": "sha512-GSG9/rSau8vGfkOmrmseRVYXoEjo3NPNsoM4nwvI1uWlKdzmlZ8UCw7FqCUrlQ5u0C5dRR7MG9EJUCV8LZegLA==",
+      "version": "7.15.0",
+      "resolved": "https://registry.npmjs.org/npm/-/npm-7.15.0.tgz",
+      "integrity": "sha512-GIXNqy3obii54oPF0gbcBNq4aYuB/Ovuu/uYp1eS4nij2PEDMnoOh6RoSv2MDvAaB4a+JbpX/tjDxLO7JAADgQ==",
       "requires": {
         "@npmcli/arborist": "^2.6.0",
         "@npmcli/ci-detect": "^1.2.0",
@@ -493,7 +493,7 @@
         "ansistyles": "~0.1.3",
         "archy": "~1.0.0",
         "byte-size": "^7.0.1",
-        "cacache": "^15.1.0",
+        "cacache": "^15.2.0",
         "chalk": "^4.1.0",
         "chownr": "^2.0.0",
         "cli-columns": "^3.1.2",
@@ -526,7 +526,7 @@
         "ms": "^2.1.2",
         "node-gyp": "^7.1.2",
         "nopt": "^5.0.0",
-        "npm-audit-report": "^2.1.4",
+        "npm-audit-report": "^2.1.5",
         "npm-package-arg": "^8.1.2",
         "npm-pick-manifest": "^6.1.1",
         "npm-profile": "^5.0.3",
@@ -792,7 +792,7 @@
           "version": "7.0.1"
         },
         "cacache": {
-          "version": "15.1.0",
+          "version": "15.2.0",
           "requires": {
             "@npmcli/move-file": "^1.0.1",
             "chownr": "^2.0.0",
@@ -1198,7 +1198,7 @@
           }
         },
         "is-core-module": {
-          "version": "2.2.0",
+          "version": "2.4.0",
           "requires": {
             "has": "^1.0.3"
           }
@@ -1501,7 +1501,7 @@
           }
         },
         "npm-audit-report": {
-          "version": "2.1.4",
+          "version": "2.1.5",
           "requires": {
             "chalk": "^4.0.0"
           }
@@ -2275,9 +2275,9 @@
       }
     },
     "ws": {
-      "version": "7.4.5",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.5.tgz",
-      "integrity": "sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g=="
+      "version": "7.4.6",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz",
+      "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A=="
     },
     "wtfnode": {
       "version": "0.8.4",
diff --git a/package.json b/package.json
index bb184cf..ccd480d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "canhazdb-server",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "description": "A shaded and clustered database communicated over http rest.",
   "main": "./lib/index.js",
   "bin": {
@@ -20,14 +20,14 @@
     "lockbase": "^1.0.9",
     "minimist": "^1.2.5",
     "ndjson-fe": "^1.2.7",
-    "npm": "^7.14.0",
+    "npm": "^7.15.0",
     "qs": "^6.10.1",
     "reconnecting-websocket": "^4.4.0",
     "server-destroy": "^1.0.1",
     "tcpocket": "^5.0.6",
     "uuid": "^8.3.2",
     "write-response": "^1.2.3",
-    "ws": "^7.4.5",
+    "ws": "^7.4.6",
     "wtfnode": "^0.8.4"
   },
   "devDependencies": {