summary refs log tree commit diff
diff options
context:
space:
mode:
authorAmber Brown <hawkowl@atleastfornow.net>2018-09-06 19:47:33 +1000
committerGitHub <noreply@github.com>2018-09-06 19:47:33 +1000
commit10587f7f32f1f5c36947a172d64ff6e4de93813c (patch)
treed97032f7917ddbe69fb81756086a5d05d1ad7388
parentversion and towncrier (diff)
parentCreate 3802.misc (diff)
downloadsynapse-10587f7f32f1f5c36947a172d64ff6e4de93813c.tar.xz
Merge pull request #3802 from matrix-org/jcgruenhage/docker-unignore-synctl
remove synctl from .dockerignore
-rw-r--r--.dockerignore1
-rw-r--r--changelog.d/3802.misc1
2 files changed, 1 insertions, 1 deletions
diff --git a/.dockerignore b/.dockerignore
index 6cdb8532d3..0180602e56 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -3,6 +3,5 @@ Dockerfile
 .gitignore
 demo/etc
 tox.ini
-synctl
 .git/*
 .tox/*
diff --git a/changelog.d/3802.misc b/changelog.d/3802.misc
new file mode 100644
index 0000000000..a00eccb283
--- /dev/null
+++ b/changelog.d/3802.misc
@@ -0,0 +1 @@
+Unignore synctl in .dockerignore to fix docker builds