From bb89fa4aab64f2f4ff7170e4b3ef65d7e8ed4c71 Mon Sep 17 00:00:00 2001 From: Alex Date: Sun, 8 May 2022 07:07:58 -0500 Subject: [PATCH] Modify docker-compose to be compatible with k8s (#149) * Modify docker-compose file using a hyphen for services instead of underscore * Change URL in Nginx setting --- docker/docker-compose.dev.yml | 18 +++++++++--------- docker/docker-compose.gpu.yml | 18 +++++++++--------- docker/docker-compose.yml | 22 +++++++++++----------- docker/settings/nginx-conf/nginx.conf | 2 +- 4 files changed, 30 insertions(+), 30 deletions(-) diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.yml index 08566b0017..c3fdad0407 100644 --- a/docker/docker-compose.dev.yml +++ b/docker/docker-compose.dev.yml @@ -1,7 +1,7 @@ version: "3.8" services: - immich_server: + immich-server: image: immich-server-dev:1.9.0 build: context: ../server @@ -21,9 +21,9 @@ services: - redis - database networks: - - immich_network + - immich-network - immich_microservices: + immich-microservices: image: immich-microservices-dev:1.9.0 build: context: ../microservices @@ -42,14 +42,14 @@ services: depends_on: - database networks: - - immich_network + - immich-network redis: container_name: immich_redis image: redis:6.2 networks: - - immich_network + - immich-network database: container_name: immich_postgres @@ -66,7 +66,7 @@ services: ports: - 5432:5432 networks: - - immich_network + - immich-network nginx: container_name: proxy_nginx @@ -79,11 +79,11 @@ services: logging: driver: none networks: - - immich_network + - immich-network depends_on: - - immich_server + - immich-server networks: - immich_network: + immich-network: volumes: pgdata: diff --git a/docker/docker-compose.gpu.yml b/docker/docker-compose.gpu.yml index c2dde0c809..e085c4d48f 100644 --- a/docker/docker-compose.gpu.yml +++ b/docker/docker-compose.gpu.yml @@ -1,7 +1,7 @@ version: "3.8" services: - immich_server: + immich-server: image: immich-server-dev:1.9.0 build: context: ../server @@ -19,9 +19,9 @@ services: - redis - database networks: - - immich_network + - immich-network - immich_microservices: + immich-microservices: image: immich-microservices-dev:1.9.0 build: context: ../microservices @@ -46,13 +46,13 @@ services: - database - immich_server networks: - - immich_network + - immich-network redis: container_name: immich_redis image: redis:6.2 networks: - - immich_network + - immich-network database: container_name: immich_postgres @@ -69,7 +69,7 @@ services: ports: - 5432:5432 networks: - - immich_network + - immich-network nginx: container_name: proxy_nginx @@ -82,11 +82,11 @@ services: logging: driver: none networks: - - immich_network + - immich-network depends_on: - - immich_server + - immich-server networks: - immich_network: + immich-network: volumes: pgdata: diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 5b0d716140..372d1d8355 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -1,8 +1,8 @@ version: "3.8" services: - immich_server: - image: altran1502/immich-server:v1.9.0_13-dev + immich-server: + image: altran1502/immich-server:latest entrypoint: ["/bin/sh", "./entrypoint.sh"] expose: - "3000" @@ -16,11 +16,11 @@ services: - redis - database networks: - - immich_network + - immich-network restart: unless-stopped - immich_microservices: - image: altran1502/immich-microservices:v1.9.0_13-dev + immich-microservices: + image: altran1502/immich-microservices:latest entrypoint: ["/bin/sh", "./entrypoint.sh"] expose: - "3001" @@ -33,14 +33,14 @@ services: depends_on: - database networks: - - immich_network + - immich-network restart: unless-stopped redis: container_name: immich_redis image: redis:6.2 networks: - - immich_network + - immich-network database: container_name: immich_postgres @@ -57,7 +57,7 @@ services: ports: - 5432:5432 networks: - - immich_network + - immich-network nginx: container_name: proxy_nginx @@ -70,11 +70,11 @@ services: logging: driver: none networks: - - immich_network + - immich-network depends_on: - - immich_server + - immich-server networks: - immich_network: + immich-network: volumes: pgdata: \ No newline at end of file diff --git a/docker/settings/nginx-conf/nginx.conf b/docker/settings/nginx-conf/nginx.conf index 73fdd77ec8..92bca82162 100644 --- a/docker/settings/nginx-conf/nginx.conf +++ b/docker/settings/nginx-conf/nginx.conf @@ -41,6 +41,6 @@ server { proxy_set_header Connection "upgrade"; proxy_set_header Host $host; - proxy_pass http://immich_server:3000; + proxy_pass http://immich-server:3000; } }