From 2dcccb37a05468f4eb60555859849f806f8ff36a Mon Sep 17 00:00:00 2001
From: Devin Buhl <onedr0p@users.noreply.github.com>
Date: Mon, 3 Apr 2023 16:05:29 -0400
Subject: [PATCH] chore(docker): Default NODE_ENV to production for server
 image and update alpine version (#2157)

* default NODE_ENV to production for server image

* update node image to use 3.17 alpine in server

* update web docker image to use alpine 3.17

* remove NODE_ENV from production docker-compose

* NODE_ENV is also needed default in machine-learning
---
 docker/docker-compose.yml   | 6 ------
 machine-learning/Dockerfile | 2 ++
 server/Dockerfile           | 6 ++++--
 web/Dockerfile              | 2 +-
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 60bc9b7ccd..bb2f3f1e73 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -9,8 +9,6 @@ services:
       - ${UPLOAD_LOCATION}:/usr/src/app/upload
     env_file:
       - .env
-    environment:
-      - NODE_ENV=production
     depends_on:
       - redis
       - database
@@ -25,8 +23,6 @@ services:
       - ${UPLOAD_LOCATION}:/usr/src/app/upload
     env_file:
       - .env
-    environment:
-      - NODE_ENV=production
     depends_on:
       - redis
       - database
@@ -41,8 +37,6 @@ services:
       - model-cache:/cache
     env_file:
       - .env
-    environment:
-      - NODE_ENV=production
     restart: always
 
   immich-web:
diff --git a/machine-learning/Dockerfile b/machine-learning/Dockerfile
index 126cfee291..3f35c95df8 100644
--- a/machine-learning/Dockerfile
+++ b/machine-learning/Dockerfile
@@ -11,6 +11,8 @@ RUN /opt/venv/bin/pip install --no-deps sentence-transformers
 
 FROM python:3.10-slim
 
+ENV NODE_ENV=production
+
 COPY --from=builder /opt/venv /opt/venv
 
 ENV TRANSFORMERS_CACHE=/cache \
diff --git a/server/Dockerfile b/server/Dockerfile
index 843f720b58..51891478a6 100644
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:16-alpine3.14 as builder
+FROM node:16-alpine3.17 as builder
 
 WORKDIR /usr/src/app
 
@@ -17,7 +17,9 @@ RUN npm run build
 RUN npm prune --omit=dev --omit=optional
 
 
-FROM node:16-alpine3.14
+FROM node:16-alpine3.17
+
+ENV NODE_ENV=production
 
 WORKDIR /usr/src/app
 
diff --git a/web/Dockerfile b/web/Dockerfile
index 4dc4abaf26..9c98f1242e 100644
--- a/web/Dockerfile
+++ b/web/Dockerfile
@@ -1,5 +1,5 @@
 # Our Node base image
-FROM node:16-alpine3.14 as base
+FROM node:16-alpine3.17 as base
 
 WORKDIR /usr/src/app
 EXPOSE 3000