grishka/lemmy
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix conflicts in docker-compose.yml

Browse source
This commit is contained in:
Felix Ableitner 2021-03-19 18:09:05 +01:00
parent 4f54108a9c
commit 05b07b8cbb
1 changed files with 0 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
docker/federation/docker-compose.yml
View file

@ -29,11 +29,7 @@ services:
- ./volumes/pictrs_alpha:/mnt - ./volumes/pictrs_alpha:/mnt
lemmy-alpha-ui: lemmy-alpha-ui:
<<<<<<< HEAD
image: lemmy-ui:test
=======
image: dessalines/lemmy-ui:0.10.0-rc.5 image: dessalines/lemmy-ui:0.10.0-rc.5
>>>>>>> main
environment: environment:
- LEMMY_INTERNAL_HOST=lemmy-alpha:8541 - LEMMY_INTERNAL_HOST=lemmy-alpha:8541
- LEMMY_EXTERNAL_HOST=localhost:8541 - LEMMY_EXTERNAL_HOST=localhost:8541
@ -62,11 +58,7 @@ services:
- ./volumes/postgres_alpha:/var/lib/postgresql/data - ./volumes/postgres_alpha:/var/lib/postgresql/data
lemmy-beta-ui: lemmy-beta-ui:
<<<<<<< HEAD
image: lemmy-ui:test
=======
image: dessalines/lemmy-ui:0.10.0-rc.5 image: dessalines/lemmy-ui:0.10.0-rc.5
>>>>>>> main
environment: environment:
- LEMMY_INTERNAL_HOST=lemmy-beta:8551 - LEMMY_INTERNAL_HOST=lemmy-beta:8551
- LEMMY_EXTERNAL_HOST=localhost:8551 - LEMMY_EXTERNAL_HOST=localhost:8551
@ -95,11 +87,7 @@ services:
- ./volumes/postgres_beta:/var/lib/postgresql/data - ./volumes/postgres_beta:/var/lib/postgresql/data
lemmy-gamma-ui: lemmy-gamma-ui:
<<<<<<< HEAD
image: lemmy-ui:test
=======
image: dessalines/lemmy-ui:0.10.0-rc.5 image: dessalines/lemmy-ui:0.10.0-rc.5
>>>>>>> main
environment: environment:
- LEMMY_INTERNAL_HOST=lemmy-gamma:8561 - LEMMY_INTERNAL_HOST=lemmy-gamma:8561
- LEMMY_EXTERNAL_HOST=localhost:8561 - LEMMY_EXTERNAL_HOST=localhost:8561