Your-System/Docker-development
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update caddy proxy

Browse Source
This commit is contained in:
Arnie 2018-12-10 13:35:37 +01:00
parent 75be9aef27
commit 52e3e92452
4 changed files with 9 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
dev-proxy/Dockerfile
View File

@ -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

2
dev-proxy/Makefile
View File

@ -8,7 +8,7 @@ all: build release
build: 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: tag:
docker tag $(DOCKER_REGISTRY)/$(APP_NAME):latest $(DOCKER_PUBLIC_REGISTRY)/$(APP_NAME):latest docker tag $(DOCKER_REGISTRY)/$(APP_NAME):latest $(DOCKER_PUBLIC_REGISTRY)/$(APP_NAME):latest

13
dev-proxy/src/Dockerfile
View File

@ -1,10 +1,8 @@
FROM alpine:3.6 FROM alpine:3.8
LABEL maintainer="Nikita Sobolev <sobolevn@wemake.services>" ARG CADDY_VERSION="0.11.1"
ARG CADDY_VERSION="0.10.10"
ARG FOREGO_VERSION="0.16.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 CADDYPATH="/etc/caddy"
ENV DOCKER_HOST unix:///tmp/docker.sock ENV DOCKER_HOST unix:///tmp/docker.sock
@ -12,9 +10,8 @@ ENV DOCKER_HOST unix:///tmp/docker.sock
# Install wget and install/updates certificates # Install wget and install/updates certificates
RUN apk update && apk upgrade \ RUN apk add --no-cache bash openssh-client git && \
&& apk add --no-cache bash openssh-client git \ apk add --no-cache --virtual .build-dependencies curl wget tar
&& apk add --no-cache --virtual .build-dependencies curl wget tar
# Install Forego # Install Forego

4
dev-proxy/src/docker-gen/templates/Caddyfile.tmpl
View File

@ -39,7 +39,9 @@ http://{{ $host }}, https://{{ $host }} {
{{ end }} {{ end }}
} }
gzip gzip {
not /__webpack_hmr/
}
log stdout log stdout
errors stderr errors stderr
} }