Merge branch 'master' of github.com:beyondcode/phunnel

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"]

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

resources/views/server/errors/404.twig

@@ -34,7 +34,7 @@
             The tunnel "{{ subdomain }}" was not found on this Expose server.
         </p>
         <p class="pt-2 text-base">
-            Do you want to host your own Expose server? Check out the <a href="https://sharedwithexpose.com" class="underline">official documentation</a>.
+            Do you want to host your own Expose server? Check out the <a href="https://beyondco.de/docs/expose" class="underline">official documentation</a>.
         </p>
     </div>
 </div>

resources/views/server/homepage.twig

@@ -31,7 +31,7 @@
     <div class="text-dark-blue-800 text-xl pt-16">
         <h1 class="text-2xl font-bold">Welcome to Expose</h1>
         <p class="pt-2 text-base">
-            Do you want to host your own Expose server? Check out the <a href="https://sharedwithexpose.com" class="underline">official documentation</a>.
+            Do you want to host your own Expose server? Check out the <a href="https://beyondco.de/docs/expose" class="underline">official documentation</a>.
         </p>
     </div>
 </div>

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 */