Browse Source

Merge pull request 'Add complement support for CI' (#209) from valkum/complement into master

Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/209
ruma
Timo Kösters 5 years ago
parent
commit
a89f7eaf9f
  1. 3
      .dockerignore
  2. 30
      tests/Complement.Dockerfile
  3. 0
      tests/sytest/are-we-synapse-yet.list
  4. 0
      tests/sytest/are-we-synapse-yet.py
  5. 0
      tests/sytest/show-expected-fail-tests.sh
  6. 0
      tests/sytest/sytest-blacklist
  7. 0
      tests/sytest/sytest-whitelist

3
.dockerignore

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
# Local build and dev artifacts
target
sytest
tests
# Docker files
Dockerfile*
@ -21,7 +21,6 @@ docker-compose* @@ -21,7 +21,6 @@ docker-compose*
# Toml files
rustfmt.toml
Rocket-example.toml
# Documentation
*.md

30
tests/Complement.Dockerfile

@ -0,0 +1,30 @@ @@ -0,0 +1,30 @@
FROM valkum/docker-rust-ci:latest as builder
WORKDIR /workdir
ARG RUSTC_WRAPPER
ARG AWS_ACCESS_KEY_ID
ARG AWS_SECRET_ACCESS_KEY
ARG SCCACHE_BUCKET
ARG SCCACHE_ENDPOINT
ARG SCCACHE_S3_USE_SSL
COPY . .
RUN cargo build
FROM valkum/docker-rust-ci:latest
WORKDIR /workdir
RUN curl -OL "https://github.com/caddyserver/caddy/releases/download/v2.1.1/caddy_2.1.1_linux_amd64.tar.gz"
RUN tar xzf caddy_2.1.1_linux_amd64.tar.gz
COPY --from=builder /workdir/target/debug/conduit /workdir/conduit
COPY Rocket-example.toml Rocket.toml
ENV SERVER_NAME=localhost
RUN sed -i "s/server_name = \"your.server.name\"/server_name = \"${SERVER_NAME}\"/g" Rocket.toml
RUN sed -i "s/port = 14004/port = 8008/g" Rocket.toml
EXPOSE 8008 8448
CMD /workdir/caddy reverse-proxy --from ${SERVER_NAME}:8448 --to localhost:8008 > /dev/null 2>&1 & /workdir/conduit

0
sytest/are-we-synapse-yet.list → tests/sytest/are-we-synapse-yet.list

0
sytest/are-we-synapse-yet.py → tests/sytest/are-we-synapse-yet.py

0
sytest/show-expected-fail-tests.sh → tests/sytest/show-expected-fail-tests.sh

0
sytest/sytest-blacklist → tests/sytest/sytest-blacklist

0
sytest/sytest-whitelist → tests/sytest/sytest-whitelist

Loading…
Cancel
Save