From 63f3849872b9e5670c591d5c916ea733f463c4c0 Mon Sep 17 00:00:00 2001
From: chimiana <chimiana@gmail.com>
Date: Sat, 17 Dec 2022 00:25:46 +0000
Subject: [PATCH] Changed filenames and .gitignore to allow a working
 docker-compose next to the example provided

---
 .gitignore                                             | 3 +++
 dev/{docker-compose.yml => docker-compose.yml.example} | 7 +++++++
 2 files changed, 10 insertions(+)
 rename dev/{docker-compose.yml => docker-compose.yml.example} (86%)

diff --git a/.gitignore b/.gitignore
index d511fa5ad..ff2b4f8cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,6 +33,9 @@ coverage
 !/.config/example.yml
 !/.config/docker_example.env
 
+#docker dev config
+/dev/docker-compose.yml
+
 # misskey
 /build
 built
diff --git a/dev/docker-compose.yml b/dev/docker-compose.yml.example
similarity index 86%
rename from dev/docker-compose.yml
rename to dev/docker-compose.yml.example
index 25c2e9ea9..5125a7b72 100644
--- a/dev/docker-compose.yml
+++ b/dev/docker-compose.yml.example
@@ -4,6 +4,7 @@ services:
   web:
     image: docker.io/thatonecalculator/calckey
     build: ..
+    container_name: calckey_web
     restart: always
     depends_on:
       - db
@@ -13,12 +14,14 @@ services:
       - "3000:3000"
     networks:
       - network
+#      - web
     volumes:
       - ../files:/calckey/files
       - ../.config:/calckey/.config:ro
 
   redis:
     restart: always
+    container_name: calckey_redis
     image: docker.io/redis:7.0-alpine
     networks:
       - network
@@ -27,6 +30,7 @@ services:
 
   db:
     restart: always
+    container_name: calckey_db
     image: docker.io/postgres:12.2-alpine
     networks:
       - network
@@ -48,3 +52,6 @@ services:
 
 networks:
   network:
+#  web:
+#    external:
+#      name: web