From f21e70669c3e53a29c5b58e4ad8b1d08bce1aaca Mon Sep 17 00:00:00 2001 From: Arnie Date: Sun, 22 Nov 2020 14:01:18 +0100 Subject: [PATCH] Do not cache not found site fallback --- dev-proxy/Makefile | 2 +- dev-proxy/run | 4 +--- dev-proxy/src/Dockerfile | 2 +- dev-proxy/src/docker-gen/templates/Caddyfile.tmpl | 1 + 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dev-proxy/Makefile b/dev-proxy/Makefile index 4a1b830..5966335 100644 --- a/dev-proxy/Makefile +++ b/dev-proxy/Makefile @@ -4,7 +4,7 @@ APP_NAME = dev-proxy APP_VERSION = 2.0 -all: build release +all: build tag release build: diff --git a/dev-proxy/run b/dev-proxy/run index 507fb6e..ac66857 100755 --- a/dev-proxy/run +++ b/dev-proxy/run @@ -22,7 +22,7 @@ init() { } makePrivate() { - docker pull ${IMAGE_NAME}:${IMAGE_VERSION} || return $? +# docker pull ${IMAGE_NAME}:${IMAGE_VERSION} || return $? NETWORKS=(${PROXY_NETWORK}) __createNetworks @@ -38,8 +38,6 @@ makePrivate() { --net ${PROXY_NETWORK} \ ${IMAGE_NAME}:${IMAGE_VERSION} - #-p 192.168.1.5:443:443 \ - #-p 192.168.1.5:80:80 \ [[ $? -ne 0 ]] && return 1 __ask_to_start diff --git a/dev-proxy/src/Dockerfile b/dev-proxy/src/Dockerfile index f358d80..b65b8c3 100644 --- a/dev-proxy/src/Dockerfile +++ b/dev-proxy/src/Dockerfile @@ -44,7 +44,7 @@ VOLUME /etc/caddy # Starting app: -ADD . /code +COPY [".", "/code"] WORKDIR /code ENTRYPOINT ["sh", "/code/docker-entrypoint.sh"] diff --git a/dev-proxy/src/docker-gen/templates/Caddyfile.tmpl b/dev-proxy/src/docker-gen/templates/Caddyfile.tmpl index e02816d..ae4573e 100644 --- a/dev-proxy/src/docker-gen/templates/Caddyfile.tmpl +++ b/dev-proxy/src/docker-gen/templates/Caddyfile.tmpl @@ -13,6 +13,7 @@ root * /code/errorPages/siteNotFound file_server + header Cache-Control "no-cache, max-age=0" } {{ if $hosts }}