Changed filenames and .gitignore to allow a working docker-compose next to the example provided
This commit is contained in:
parent
9137698245
commit
63f3849872
|
@ -33,6 +33,9 @@ coverage
|
||||||
!/.config/example.yml
|
!/.config/example.yml
|
||||||
!/.config/docker_example.env
|
!/.config/docker_example.env
|
||||||
|
|
||||||
|
#docker dev config
|
||||||
|
/dev/docker-compose.yml
|
||||||
|
|
||||||
# misskey
|
# misskey
|
||||||
/build
|
/build
|
||||||
built
|
built
|
||||||
|
|
|
@ -4,6 +4,7 @@ services:
|
||||||
web:
|
web:
|
||||||
image: docker.io/thatonecalculator/calckey
|
image: docker.io/thatonecalculator/calckey
|
||||||
build: ..
|
build: ..
|
||||||
|
container_name: calckey_web
|
||||||
restart: always
|
restart: always
|
||||||
depends_on:
|
depends_on:
|
||||||
- db
|
- db
|
||||||
|
@ -13,12 +14,14 @@ services:
|
||||||
- "3000:3000"
|
- "3000:3000"
|
||||||
networks:
|
networks:
|
||||||
- network
|
- network
|
||||||
|
# - web
|
||||||
volumes:
|
volumes:
|
||||||
- ../files:/calckey/files
|
- ../files:/calckey/files
|
||||||
- ../.config:/calckey/.config:ro
|
- ../.config:/calckey/.config:ro
|
||||||
|
|
||||||
redis:
|
redis:
|
||||||
restart: always
|
restart: always
|
||||||
|
container_name: calckey_redis
|
||||||
image: docker.io/redis:7.0-alpine
|
image: docker.io/redis:7.0-alpine
|
||||||
networks:
|
networks:
|
||||||
- network
|
- network
|
||||||
|
@ -27,6 +30,7 @@ services:
|
||||||
|
|
||||||
db:
|
db:
|
||||||
restart: always
|
restart: always
|
||||||
|
container_name: calckey_db
|
||||||
image: docker.io/postgres:12.2-alpine
|
image: docker.io/postgres:12.2-alpine
|
||||||
networks:
|
networks:
|
||||||
- network
|
- network
|
||||||
|
@ -48,3 +52,6 @@ services:
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
network:
|
network:
|
||||||
|
# web:
|
||||||
|
# external:
|
||||||
|
# name: web
|
Loading…
Reference in New Issue