From cf74165479f88f18c962cf9b2378ea297831735d Mon Sep 17 00:00:00 2001 From: Marcel Pociot Date: Mon, 7 Jun 2021 19:02:49 +0000 Subject: [PATCH 1/3] Apply fixes from StyleCI --- tests/Feature/Server/ApiTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Feature/Server/ApiTest.php b/tests/Feature/Server/ApiTest.php index 2fb2f98..879963e 100644 --- a/tests/Feature/Server/ApiTest.php +++ b/tests/Feature/Server/ApiTest.php @@ -75,7 +75,7 @@ class ApiTest extends TestCase 'Content-Type' => 'application/json', ], json_encode([ 'name' => 'Marcel', - 'token' => 'this-is-my-token' + 'token' => 'this-is-my-token', ]))); /** @var Response $response */ From 8c5b52769e26caf71eeb1d8e85e434e3cc86f896 Mon Sep 17 00:00:00 2001 From: Matthieu Mota Date: Tue, 8 Jun 2021 12:58:29 +0200 Subject: [PATCH 2/3] Fix docker entrypoint (#174) --- Dockerfile | 5 +++-- docker-entrypoint.sh | 9 +++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 docker-entrypoint.sh diff --git a/Dockerfile b/Dockerfile index 5e26204..b731d02 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,5 +20,6 @@ ENV username=username ENV password=password ENV exposeConfigPath=/src/config/expose.php -CMD sed -i "s|username|${username}|g" ${exposeConfigPath} && sed -i "s|password|${password}|g" ${exposeConfigPath} && php expose serve ${domain} --port ${port} --validateAuthTokens -ENTRYPOINT ["/src/expose"] +COPY docker-entrypoint.sh /usr/bin/ +RUN chmod 755 /usr/bin/docker-entrypoint.sh +ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh new file mode 100644 index 0000000..ed1e8e4 --- /dev/null +++ b/docker-entrypoint.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +sed -i "s|username|${username}|g" ${exposeConfigPath} && sed -i "s|password|${password}|g" ${exposeConfigPath} + +if [[ $# -eq 0 ]]; then + exec /src/expose serve ${domain} --port ${port} --validateAuthTokens +else + exec /src/expose "$@" +fi From f56524174029a439bc6ef521ffa6828cbe35c7ab Mon Sep 17 00:00:00 2001 From: r3vit Date: Tue, 8 Jun 2021 12:58:45 +0200 Subject: [PATCH 3/3] Replace documentation link in home and 404 page with direct link to official docs beyondco.de (#222) --- resources/views/server/errors/404.twig | 2 +- resources/views/server/homepage.twig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/server/errors/404.twig b/resources/views/server/errors/404.twig index c7e89e5..79b70e0 100644 --- a/resources/views/server/errors/404.twig +++ b/resources/views/server/errors/404.twig @@ -34,7 +34,7 @@ The tunnel "{{ subdomain }}" was not found on this Expose server.

- Do you want to host your own Expose server? Check out the official documentation. + Do you want to host your own Expose server? Check out the official documentation.

diff --git a/resources/views/server/homepage.twig b/resources/views/server/homepage.twig index 39f1eaf..5b303fd 100644 --- a/resources/views/server/homepage.twig +++ b/resources/views/server/homepage.twig @@ -31,7 +31,7 @@

Welcome to Expose

- Do you want to host your own Expose server? Check out the official documentation. + Do you want to host your own Expose server? Check out the official documentation.