Merge branch 'develop'

.drone.yml

@@ -9,7 +9,7 @@ trigger:
 
 steps:
   - name: build
-    image: docker:18.09.6
+    image: docker:18.09.7
     environment:
       DOCKER_HOST: tcp://docker.avptp.org:2376
       DOCKER_CA:
@@ -39,7 +39,7 @@ steps:
       - docker push $IMAGE
 
   - name: pre-deploy
-    image: lachlanevenson/k8s-helm:v2.13.1
+    image: lachlanevenson/k8s-helm:v2.14.1
     environment:
       REGISTRY_HOST: registry.avptp.org
       REGISTRY_CONFIG:
@@ -56,7 +56,7 @@ steps:
         > spec.yaml
 
   - name: deploy
-    image: lachlanevenson/k8s-kubectl:v1.14.1
+    image: lachlanevenson/k8s-kubectl:v1.15.0
     environment:
       KUBERNETES_CONFIG:
         from_secret: kubernetes

Dockerfile

@@ -8,9 +8,7 @@ ENV PATH="${PATH}:/app/node_modules/.bin"
 
 ARG USER_ID=1000
 
-RUN apk add --no-cache \
-        bash \
- && if [ $USER_ID -ne 1000 ]; then \
+RUN if [ $USER_ID -ne 1000 ]; then \
         apk add --no-cache -t tmp shadow \
      && groupmod -g $USER_ID node \
      && usermod -u $USER_ID -g $USER_ID node \
@@ -33,7 +31,7 @@ RUN npm ci \
 
 
 ## Runtime image
-FROM nginx:1.17.0-alpine AS runtime
+FROM nginx:1.17.1-alpine AS runtime
 
 WORKDIR /app
 

docker-compose.yml

@@ -1,4 +1,4 @@
-version: "3.7"
+version: '3.7'
 
 services:
 
@@ -12,4 +12,4 @@ services:
     volumes:
       - .:/app
     ports:
-      - "${WEB_PORT:-80}:3000"
+      - ${WEB_PORT:-80}:3000