From 308a1c6cfefbe3b84d92ac53ae2ef8474ec898a5 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Tue, 28 Aug 2018 09:51:43 +1200 Subject: [PATCH] docker: remove one step from proxy setup We can always deploy these files since the default versions have all the settings commented out - save proxy users from needing to uncomment these (it's annoying if you miss doing so). Signed-off-by: Paul Eggleton --- Dockerfile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2f1ad57..964a1ad 100644 --- a/Dockerfile +++ b/Dockerfile @@ -59,11 +59,9 @@ RUN mkdir /opt/workdir \ && chown -R layers /opt USER layers -## Uncomment to add a .gitconfig file within container -#COPY docker/.gitconfig /home/layers/.gitconfig -## Uncomment to add a proxy script within container, if you choose to -## do so, you will also have to edit .gitconfig appropriately -#COPY docker/git-proxy /opt/bin/git-proxy +# Always copy in .gitconfig and proxy helper script (they need editing to be active) +COPY docker/.gitconfig /home/layers/.gitconfig +COPY docker/git-proxy /opt/bin/git-proxy # Start Gunicorn CMD ["/usr/local/bin/gunicorn", "wsgi:application", "--workers=4", "--bind=:5000", "--log-level=debug", "--chdir=/opt/layerindex"]