Skip to content

Commit bb89fa4

Browse files
authored
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
1 parent 43d6391 commit bb89fa4

File tree

4 files changed

+30
-30
lines changed

4 files changed

+30
-30
lines changed

docker/docker-compose.dev.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: "3.8"
22

33
services:
4-
immich_server:
4+
immich-server:
55
image: immich-server-dev:1.9.0
66
build:
77
context: ../server
@@ -21,9 +21,9 @@ services:
2121
- redis
2222
- database
2323
networks:
24-
- immich_network
24+
- immich-network
2525

26-
immich_microservices:
26+
immich-microservices:
2727
image: immich-microservices-dev:1.9.0
2828
build:
2929
context: ../microservices
@@ -42,14 +42,14 @@ services:
4242
depends_on:
4343
- database
4444
networks:
45-
- immich_network
45+
- immich-network
4646

4747

4848
redis:
4949
container_name: immich_redis
5050
image: redis:6.2
5151
networks:
52-
- immich_network
52+
- immich-network
5353

5454
database:
5555
container_name: immich_postgres
@@ -66,7 +66,7 @@ services:
6666
ports:
6767
- 5432:5432
6868
networks:
69-
- immich_network
69+
- immich-network
7070

7171
nginx:
7272
container_name: proxy_nginx
@@ -79,11 +79,11 @@ services:
7979
logging:
8080
driver: none
8181
networks:
82-
- immich_network
82+
- immich-network
8383
depends_on:
84-
- immich_server
84+
- immich-server
8585

8686
networks:
87-
immich_network:
87+
immich-network:
8888
volumes:
8989
pgdata:

docker/docker-compose.gpu.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: "3.8"
22

33
services:
4-
immich_server:
4+
immich-server:
55
image: immich-server-dev:1.9.0
66
build:
77
context: ../server
@@ -19,9 +19,9 @@ services:
1919
- redis
2020
- database
2121
networks:
22-
- immich_network
22+
- immich-network
2323

24-
immich_microservices:
24+
immich-microservices:
2525
image: immich-microservices-dev:1.9.0
2626
build:
2727
context: ../microservices
@@ -46,13 +46,13 @@ services:
4646
- database
4747
- immich_server
4848
networks:
49-
- immich_network
49+
- immich-network
5050

5151
redis:
5252
container_name: immich_redis
5353
image: redis:6.2
5454
networks:
55-
- immich_network
55+
- immich-network
5656

5757
database:
5858
container_name: immich_postgres
@@ -69,7 +69,7 @@ services:
6969
ports:
7070
- 5432:5432
7171
networks:
72-
- immich_network
72+
- immich-network
7373

7474
nginx:
7575
container_name: proxy_nginx
@@ -82,11 +82,11 @@ services:
8282
logging:
8383
driver: none
8484
networks:
85-
- immich_network
85+
- immich-network
8686
depends_on:
87-
- immich_server
87+
- immich-server
8888

8989
networks:
90-
immich_network:
90+
immich-network:
9191
volumes:
9292
pgdata:

docker/docker-compose.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
version: "3.8"
22

33
services:
4-
immich_server:
5-
image: altran1502/immich-server:v1.9.0_13-dev
4+
immich-server:
5+
image: altran1502/immich-server:latest
66
entrypoint: ["/bin/sh", "./entrypoint.sh"]
77
expose:
88
- "3000"
@@ -16,11 +16,11 @@ services:
1616
- redis
1717
- database
1818
networks:
19-
- immich_network
19+
- immich-network
2020
restart: unless-stopped
2121

22-
immich_microservices:
23-
image: altran1502/immich-microservices:v1.9.0_13-dev
22+
immich-microservices:
23+
image: altran1502/immich-microservices:latest
2424
entrypoint: ["/bin/sh", "./entrypoint.sh"]
2525
expose:
2626
- "3001"
@@ -33,14 +33,14 @@ services:
3333
depends_on:
3434
- database
3535
networks:
36-
- immich_network
36+
- immich-network
3737
restart: unless-stopped
3838

3939
redis:
4040
container_name: immich_redis
4141
image: redis:6.2
4242
networks:
43-
- immich_network
43+
- immich-network
4444

4545
database:
4646
container_name: immich_postgres
@@ -57,7 +57,7 @@ services:
5757
ports:
5858
- 5432:5432
5959
networks:
60-
- immich_network
60+
- immich-network
6161

6262
nginx:
6363
container_name: proxy_nginx
@@ -70,11 +70,11 @@ services:
7070
logging:
7171
driver: none
7272
networks:
73-
- immich_network
73+
- immich-network
7474
depends_on:
75-
- immich_server
75+
- immich-server
7676

7777
networks:
78-
immich_network:
78+
immich-network:
7979
volumes:
8080
pgdata:

docker/settings/nginx-conf/nginx.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,6 @@ server {
4141
proxy_set_header Connection "upgrade";
4242
proxy_set_header Host $host;
4343

44-
proxy_pass http://immich_server:3000;
44+
proxy_pass http://immich-server:3000;
4545
}
4646
}

0 commit comments

Comments
 (0)