diff --git a/Dockerfile b/Dockerfile index b4f4770..d6519f6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,4 +25,4 @@ COPY --from=build /home/app/bin/faaso-daemon /home/app/bin/faaso /usr/bin/ RUN mkdir /secrets RUN echo "sarasa" > /secrets/sarlanga -CMD ["/usr/bin/multirun", "faaso-daemon", "tinyproxy -d -c tinyproxy.conf"] \ No newline at end of file +CMD ["/usr/bin/multirun", "-v", "faaso-daemon", "tinyproxy -d -c tinyproxy.conf"] diff --git a/Makefile b/Makefile index e692733..b464ecd 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ build: shard.yml $(wildcard src/**/*cr) proxy: build docker build . -t faaso-proxy --no-cache start-proxy: - docker run --network=faaso-net -v /var/run/docker.sock:/var/run/docker.sock -p 8888:8888 faaso-proxy + docker run --network=faaso-net -v /var/run/docker.sock:/var/run/docker.sock -v secrets:/home/app/secrets -p 8888:8888 faaso-proxy .PHONY: build proxy-image start-proxy diff --git a/src/daemon/proxyconf.cr b/src/daemon/proxyconf.cr index 0a55560..114deb4 100644 --- a/src/daemon/proxyconf.cr +++ b/src/daemon/proxyconf.cr @@ -30,7 +30,8 @@ module Proxy funkos.sort! config = %( - UserName nobody + User nobody + Group nogroup Port 8888 Listen 0.0.0.0 Timeout 600 diff --git a/tinyproxy.conf b/tinyproxy.conf index ebd7e17..b339991 100644 --- a/tinyproxy.conf +++ b/tinyproxy.conf @@ -1,5 +1,6 @@ - - UserName nobody + User nobody + Group nogroup + LogLevel Info Port 8888 Listen 0.0.0.0 Timeout 600 @@ -7,4 +8,4 @@ ReverseOnly Yes ReverseMagic Yes ReversePath "/admin/" "http://127.0.0.1:3000/" - ReversePath "/faaso/hello/" "http://hello:3000/" \ No newline at end of file + ReversePath "/faaso/hello/" "http://hello:3000/"