From 041c711cb9d6b2ffce033f5d82dbcca8f6eb408b Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Sun, 27 Mar 2022 15:17:58 -0500
Subject: [PATCH] Add production and development docker-compose (#77)

---
 Makefile                                      |  6 +-
 docker/docker-compose.dev.yml                 | 87 +++++++++++++++++++
 docker/docker-compose.yml                     | 13 ++-
 .../shared/views/backup_controller_page.dart  |  2 +-
 4 files changed, 97 insertions(+), 11 deletions(-)
 create mode 100644 docker/docker-compose.dev.yml

diff --git a/Makefile b/Makefile
index 17d3b6c585..aad773297e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 dev:
-	docker-compose -f ./docker/docker-compose.yml up --remove-orphans
+	docker-compose -f ./docker/docker-compose.dev.yml up --remove-orphans
 
 dev-update:
-	docker-compose -f ./docker/docker-compose.yml up --build -V  --remove-orphans
+	docker-compose -f ./docker/docker-compose.dev.yml up --build -V  --remove-orphans
 
 dev-scale:
-	docker-compose -f ./docker/docker-compose.yml up --build -V  --scale immich_server=3 --remove-orphans 
+	docker-compose -f ./docker/docker-compose.dev.yml up --build -V  --scale immich_server=3 --remove-orphans 
diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.yml
new file mode 100644
index 0000000000..5f64a092b5
--- /dev/null
+++ b/docker/docker-compose.dev.yml
@@ -0,0 +1,87 @@
+version: "3.8"
+
+services:
+  immich_server:
+    image: immich-server-dev:1.3.2
+    build:
+      context: ../server
+      target: development
+      dockerfile: ../server/Dockerfile
+    command: npm run start:dev
+    expose:
+      - "3000"
+    volumes:
+      - ../server:/usr/src/app
+      - ${UPLOAD_LOCATION}:/usr/src/app/upload
+      - /usr/src/app/node_modules
+    env_file:
+      - .env
+    depends_on:
+      - redis
+      - database
+    networks:
+      - immich_network
+
+  immich_microservices:
+    image: immich-microservices-dev:1.3.2
+    build:
+      context: ../microservices
+      target: development
+      dockerfile: ../microservices/Dockerfile
+    command: npm run start:dev
+    expose:
+      - "3001"
+    volumes:
+      - ../microservices:/usr/src/app
+      - ${UPLOAD_LOCATION}:/usr/src/app/upload
+      - /usr/src/app/node_modules
+    env_file:
+      - .env
+    depends_on:
+      - database
+    networks:
+      - immich_network
+
+
+  redis:
+    container_name: immich_redis
+    image: redis:6.2
+    networks:
+      - immich_network
+
+  database:
+    container_name: immich_postgres
+    image: postgres:14
+    env_file:
+      - .env
+    environment:
+      POSTGRES_PASSWORD: ${DB_PASSWORD}
+      POSTGRES_USER: ${DB_USERNAME}
+      POSTGRES_DB: ${DB_DATABASE_NAME}
+      PG_DATA: /var/lib/postgresql/data
+    volumes:
+      - pgdata:/var/lib/postgresql/data
+    ports:
+      - 5432:5432
+    networks:
+      - immich_network
+
+  nginx:
+    container_name: proxy_nginx
+    image: nginx:latest
+    volumes:
+      - ./settings/nginx-conf:/etc/nginx/conf.d
+    ports:
+      - 2283:80
+      - 2284:443
+    logging:
+      driver: none
+    networks:
+      - immich_network
+    depends_on:
+      - immich_server
+
+networks:
+  immich_network:
+volumes:
+  pgdata:
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index d0ace94867..7da459ebcd 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -2,13 +2,12 @@ version: "3.8"
 
 services:
   immich_server:
-    image: immich-server-dev:1.3.2
+    image: immich-server:1.3.2
     build:
       context: ../server
-      target: development
+      target: production
       dockerfile: ../server/Dockerfile
-    entrypoint: ["/bin/sh", "./entrypoint.sh"]
-    # command: npm run start:dev
+    command: npm run start:prod
     expose:
       - "3000"
     volumes:
@@ -24,12 +23,12 @@ services:
       - immich_network
 
   immich_microservices:
-    image: immich-microservices-dev:1.3.2
+    image: immich-microservices:1.3.2
     build:
       context: ../microservices
-      target: development
+      target: production
       dockerfile: ../microservices/Dockerfile
-    command: npm run start:dev
+    command: npm run start:prod
     expose:
       - "3001"
     volumes:
diff --git a/mobile/lib/shared/views/backup_controller_page.dart b/mobile/lib/shared/views/backup_controller_page.dart
index 5d9c61c121..58b56dad66 100644
--- a/mobile/lib/shared/views/backup_controller_page.dart
+++ b/mobile/lib/shared/views/backup_controller_page.dart
@@ -125,7 +125,7 @@ class BackupControllerPage extends HookConsumerWidget {
             ),
             BackupInfoCard(
               title: "Total",
-              subtitle: "All images and video on the device",
+              subtitle: "All images and videos on the device",
               info: "${_backupState.totalAssetCount}",
             ),
             BackupInfoCard(