From 3e03787551c8337109f9f7b7d4ad964062c672ae Mon Sep 17 00:00:00 2001 From: Valkum Date: Wed, 16 Sep 2020 19:53:27 +0200 Subject: [PATCH] Add Complement dockerfile and move sytest dir --- tests/Complement.Dockerfile | 10 ++++++++++ {sytest => tests/sytest}/are-we-synapse-yet.list | 0 {sytest => tests/sytest}/are-we-synapse-yet.py | 0 {sytest => tests/sytest}/show-expected-fail-tests.sh | 0 {sytest => tests/sytest}/sytest-blacklist | 0 {sytest => tests/sytest}/sytest-whitelist | 0 6 files changed, 10 insertions(+) create mode 100644 tests/Complement.Dockerfile rename {sytest => tests/sytest}/are-we-synapse-yet.list (100%) rename {sytest => tests/sytest}/are-we-synapse-yet.py (100%) rename {sytest => tests/sytest}/show-expected-fail-tests.sh (100%) rename {sytest => tests/sytest}/sytest-blacklist (100%) rename {sytest => tests/sytest}/sytest-whitelist (100%) diff --git a/tests/Complement.Dockerfile b/tests/Complement.Dockerfile new file mode 100644 index 00000000..56e4bf7a --- /dev/null +++ b/tests/Complement.Dockerfile @@ -0,0 +1,10 @@ +FROM valkum/docker-rust-ci:latest +WORKDIR /build + +COPY . . +RUN cargo build + +ENV SERVER_NAME=localhost +EXPOSE 14004 8448 + +CMD sed "s/server_name: your.server.name/server_name: ${SERVER_NAME}/g" Rocket-example.toml Rocket.toml && ./target/debug/conduit \ No newline at end of file diff --git a/sytest/are-we-synapse-yet.list b/tests/sytest/are-we-synapse-yet.list similarity index 100% rename from sytest/are-we-synapse-yet.list rename to tests/sytest/are-we-synapse-yet.list diff --git a/sytest/are-we-synapse-yet.py b/tests/sytest/are-we-synapse-yet.py similarity index 100% rename from sytest/are-we-synapse-yet.py rename to tests/sytest/are-we-synapse-yet.py diff --git a/sytest/show-expected-fail-tests.sh b/tests/sytest/show-expected-fail-tests.sh similarity index 100% rename from sytest/show-expected-fail-tests.sh rename to tests/sytest/show-expected-fail-tests.sh diff --git a/sytest/sytest-blacklist b/tests/sytest/sytest-blacklist similarity index 100% rename from sytest/sytest-blacklist rename to tests/sytest/sytest-blacklist diff --git a/sytest/sytest-whitelist b/tests/sytest/sytest-whitelist similarity index 100% rename from sytest/sytest-whitelist rename to tests/sytest/sytest-whitelist