File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 22*
33
44# things to include
5+ ! .git
6+ # !.git/refs/heads
7+ # !.git/config
8+ # !.git/HEAD
59! docker
610! synapse
711! rust
Original file line number Diff line number Diff line change @@ -42,14 +42,17 @@ RUN echo "CREATE DATABASE synapse" | gosu postgres postgres --single
4242# To do this, we copy the old template out of the way and then include it
4343# with Jinja2.
4444RUN mv /conf/shared.yaml.j2 /conf/shared-orig.yaml.j2
45- COPY conf/workers-shared-extra.yaml.j2 /conf/shared.yaml.j2
45+ COPY docker/complement/ conf/workers-shared-extra.yaml.j2 /conf/shared.yaml.j2
4646
4747WORKDIR /data
4848
49- COPY conf/postgres.supervisord.conf /etc/supervisor/conf.d/postgres.conf
49+ # TODO: Copies but not to the right spot for for `SYNAPSE_VERSION` to pick it up
50+ COPY .git /data/.git/
51+
52+ COPY docker/complement/conf/postgres.supervisord.conf /etc/supervisor/conf.d/postgres.conf
5053
5154# Copy the entrypoint
52- COPY conf/start_for_complement.sh /
55+ COPY docker/complement/ conf/start_for_complement.sh /
5356
5457# Expose nginx's listener ports
5558EXPOSE 8008 8448
Original file line number Diff line number Diff line change @@ -213,7 +213,7 @@ main() {
213213 ` # .github/workflows/push_complement_image.yml) so let's just label it now` \
214214 ` # so people can reference it by the same name locally.` \
215215 -t ghcr.io/element-hq/synapse/complement-synapse \
216- -f " docker/complement/Dockerfile" " docker/complement "
216+ -f " docker/complement/Dockerfile" .
217217 echo_if_github " ::endgroup::"
218218
219219 fi
You can’t perform that action at this time.
0 commit comments