Patch Dockerfiles

Dockerfile.bridge -> ENTRYPOINT to CMD for more flexibility with the image later. Dockerfile.matrix -> Synapse log config has been patched into the image itself.
ocf · May 1, 2020 · 0076237 · 0076237
1 parent 9da37ab
commit 0076237
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 1 deletion.
diff --git a/Dockerfile.bridge b/Dockerfile.bridge
@@ -1,2 +1,6 @@
 ARG bridge_version=latest
 FROM matrixdotorg/matrix-appservice-irc:${bridge_version}
+
+# Unset ENTRYPOINT for easier operability in the image
+ENTRYPOINT []
+CMD ["/app/docker/start.sh"]
diff --git a/Dockerfile.matrix b/Dockerfile.matrix
@@ -1,2 +1,4 @@
 ARG synapse_version=latest
 FROM matrixdotorg/synapse:${synapse_version}
+
+COPY synapse.log.config /etc/matrix/synapse.log.config
diff --git a/kubernetes/secrets/synapse-config/homeserver.yaml.erb b/kubernetes/secrets/synapse-config/homeserver.yaml.erb
@@ -33,7 +33,7 @@ database:
   args:
     database: "/data/homeserver.db"
 
-log_config: "/etc/matrix-synapse/synapse.log.config"
+log_config: "/etc/matrix/synapse.log.config"
 
 media_store_path: "/data/media_store"
 enable_registration: false

diff --git a/...ets/synapse-config/synapse.log.config.erb → synapse.log.config b/...ets/synapse-config/synapse.log.config.erb → synapse.log.config