Move additional files into dedicated folder and make build the def...

...fault in the compose files.

1 files changed, 12 insertions, 11 deletions

diff --git a/docker-compose.yml b/docker-compose.yml
index 48470e6..afd3699 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,17 +3,18 @@ version: '3'
 
 services:
     homeserver:
-        ### If you already built the Conduit image with 'docker build', then you are ready to
-        ### go. Otherwise, you need to comment the 'image' line and uncomment the 'build' lines
-        ### and run: CREATED=$(date -u +'%Y-%m-%dT%H:%M:%SZ') VERSION=$(grep -m1 -o '[0-9].[0-9].[0-9]' Cargo.toml) docker-compose up -d
-        image: conduit_homeserver:latest
-        # build:
-        #     context: .
-        #     args:
-        #         CREATED:
-        #         VERSION:
-        #         LOCAL: "false"
-        #         GIT_REF: HEAD
+        ### If you already built the Conduit image with 'docker build', then you can uncomment the
+        ### 'image' line and comment out the 'build' option.
+        # image: conduit_homeserver:latest
+        ### If you want meaningful labels in you built Conduit image, you should run docker-compose like this:
+        ### CREATED=$(date -u +'%Y-%m-%dT%H:%M:%SZ') VERSION=$(grep -m1 -o '[0-9].[0-9].[0-9]' Cargo.toml) docker-compose up -d
+        build:
+            context: .
+            args:
+                CREATED:
+                VERSION:
+                LOCAL: "false"
+                GIT_REF: HEAD
         restart: unless-stopped
         ports:
             - 8448:8000