From 52e3e92452d97195a3a1891480fcd7e47bccbb7c Mon Sep 17 00:00:00 2001
From: Arnie <i@cechis.cz>
Date: Mon, 10 Dec 2018 13:35:37 +0100
Subject: [PATCH] Update caddy proxy

---
 dev-proxy/Dockerfile                          | 27 -------------------
 dev-proxy/Makefile                            |  2 +-
 dev-proxy/src/Dockerfile                      | 13 ++++-----
 .../src/docker-gen/templates/Caddyfile.tmpl   |  4 ++-
 4 files changed, 9 insertions(+), 37 deletions(-)
 delete mode 100644 dev-proxy/Dockerfile

diff --git a/dev-proxy/Dockerfile b/dev-proxy/Dockerfile
deleted file mode 100644
index 9000eaa..0000000
--- a/dev-proxy/Dockerfile
+++ /dev/null
@@ -1,27 +0,0 @@
-ARG IMAGE_NAME
-ARG IMAGE_VERSION
-FROM ${IMAGE_NAME}:${IMAGE_VERSION}
-
-RUN apk update && apk upgrade && \
-    apk add curl vim && \
-    rm -rf /var/cache/apk/*
-
-RUN mkdir -p /tmp/caddy \
- && curl -sL -o /tmp/caddy/caddy_linux_amd64.tar.gz "https://caddyserver.com/download/linux/amd64?license=personal" \
- && tar -zxf /tmp/caddy/caddy_linux_amd64.tar.gz -C /tmp/caddy \
- && mv /tmp/caddy/caddy /usr/bin/ \
- && chmod +x /usr/bin/caddy \
- && rm -rf /tmp/caddy
-
-ENV DOCKER_GEN_VERSION 0.7.4
-ENV CADDY_OPTIONS ""
-
-RUN curl -sL -o docker-gen-linux-amd64-$DOCKER_GEN_VERSION.tar.gz https://github.com/jwilder/docker-gen/releases/download/$DOCKER_GEN_VERSION/docker-gen-linux-amd64-$DOCKER_GEN_VERSION.tar.gz \
- && tar -C /usr/local/bin -xvzf docker-gen-linux-amd64-$DOCKER_GEN_VERSION.tar.gz \
- && rm /docker-gen-linux-amd64-$DOCKER_GEN_VERSION.tar.gz
-
-RUN printf ":80\nproxy / caddyserver.com" > /etc/Caddyfile
-
-ADD etc /etc
-
-ENV DOCKER_HOST unix:///tmp/docker.sock
diff --git a/dev-proxy/Makefile b/dev-proxy/Makefile
index 3fe1afa..60476eb 100644
--- a/dev-proxy/Makefile
+++ b/dev-proxy/Makefile
@@ -8,7 +8,7 @@ all: build release
 
 
 build:
-	docker build -t $(DOCKER_REGISTRY)/$(APP_NAME):latest --build-arg "IMAGE_NAME=nimmis/alpine" --build-arg "IMAGE_VERSION=3.6" ./src
+	docker build -t $(DOCKER_REGISTRY)/$(APP_NAME):latest --build-arg "IMAGE_NAME=nimmis/alpine" --build-arg "IMAGE_VERSION=3.8" ./src
 
 tag:
 	docker tag $(DOCKER_REGISTRY)/$(APP_NAME):latest $(DOCKER_PUBLIC_REGISTRY)/$(APP_NAME):latest
diff --git a/dev-proxy/src/Dockerfile b/dev-proxy/src/Dockerfile
index 45998ef..70f498c 100644
--- a/dev-proxy/src/Dockerfile
+++ b/dev-proxy/src/Dockerfile
@@ -1,10 +1,8 @@
-FROM alpine:3.6
+FROM alpine:3.8
 
-LABEL maintainer="Nikita Sobolev <sobolevn@wemake.services>"
-
-ARG CADDY_VERSION="0.10.10"
+ARG CADDY_VERSION="0.11.1"
 ARG FOREGO_VERSION="0.16.1"
-ARG DOCKER_GEN_VERSION="0.7.3"
+ARG DOCKER_GEN_VERSION="0.7.4"
 
 ENV CADDYPATH="/etc/caddy"
 ENV DOCKER_HOST unix:///tmp/docker.sock
@@ -12,9 +10,8 @@ ENV DOCKER_HOST unix:///tmp/docker.sock
 
 # Install wget and install/updates certificates
 
-RUN apk update && apk upgrade \
-  && apk add --no-cache bash openssh-client git \
-  && apk add --no-cache --virtual .build-dependencies curl wget tar
+RUN apk add --no-cache bash openssh-client git && \
+    apk add --no-cache --virtual .build-dependencies curl wget tar
 
 
 # Install Forego
diff --git a/dev-proxy/src/docker-gen/templates/Caddyfile.tmpl b/dev-proxy/src/docker-gen/templates/Caddyfile.tmpl
index fbadbfc..91b5ef1 100644
--- a/dev-proxy/src/docker-gen/templates/Caddyfile.tmpl
+++ b/dev-proxy/src/docker-gen/templates/Caddyfile.tmpl
@@ -39,7 +39,9 @@ http://{{ $host }}, https://{{ $host }}  {
     {{ end }}
   }
 
-  gzip
+  gzip {
+    not /__webpack_hmr/
+  }
   log stdout
   errors stderr
 }