From c49912b10f2f2418f45ce8da0520bb9ba9f101b6 Mon Sep 17 00:00:00 2001 From: pottava Date: Sun, 30 Dec 2018 22:03:27 +0900 Subject: [PATCH] release v1.4.1 --- README.md | 7 ++++--- docker/linux/1.4/Dockerfile | 25 +++++++++++++++++++++++++ docker/windows/1.4/Dockerfile | 9 +++++++++ prod/Dockerfile | 26 -------------------------- 4 files changed, 38 insertions(+), 29 deletions(-) create mode 100644 docker/linux/1.4/Dockerfile create mode 100644 docker/windows/1.4/Dockerfile delete mode 100644 prod/Dockerfile diff --git a/README.md b/README.md index 8c75bf9..721b67b 100644 --- a/README.md +++ b/README.md @@ -5,9 +5,10 @@ [![pottava/s3-proxy](http://dockeri.co/image/pottava/s3-proxy)](https://hub.docker.com/r/pottava/s3-proxy/) Supported tags and respective `Dockerfile` links: -・latest ([prod/Dockerfile](https://github.com/pottava/aws-s3-proxy/blob/master/prod/Dockerfile)) -・1.1 ([prod/Dockerfile](https://github.com/pottava/aws-s3-proxy/blob/master/prod/Dockerfile)) -・1 ([prod/Dockerfile](https://github.com/pottava/aws-s3-proxy/blob/master/prod/Dockerfile)) +・latest ([prod/linux/1.4/Dockerfile](https://github.com/pottava/aws-s3-proxy/blob/master/prod/linux/1.4/Dockerfile)) +・1.4 ([prod/linux/1.4/Dockerfile](https://github.com/pottava/aws-s3-proxy/blob/master/prod/linux/1.4/Dockerfile)) +・1.4-win ([prod/windows/1.4/Dockerfile](https://github.com/pottava/aws-s3-proxy/blob/master/prod/windows/1.4/Dockerfile)) +・1 ([prod/linux/1.4/Dockerfile](https://github.com/pottava/aws-s3-proxy/blob/master/prod/linux/1.4/Dockerfile)) ## Description diff --git a/docker/linux/1.4/Dockerfile b/docker/linux/1.4/Dockerfile new file mode 100644 index 0000000..a682c8c --- /dev/null +++ b/docker/linux/1.4/Dockerfile @@ -0,0 +1,25 @@ +# AWS S3 Proxy v1.4 +# docker run -d -p 8080:80 -e AWS_REGION -e AWS_ACCESS_KEY_ID -e AWS_SECRET_ACCESS_KEY -e AWS_S3_BUCKET pottava/s3-proxy + +FROM golang:1.11.4-alpine3.8 AS build-env +RUN apk --no-cache add gcc musl-dev git +RUN go get -u github.com/golang/dep/... +WORKDIR /go/src/github.com/golang/dep +RUN git checkout v0.5.0 > /dev/null 2>&1 +RUN go install github.com/golang/dep/... +RUN go get -u github.com/pottava/aws-s3-proxy +WORKDIR /go/src/github.com/pottava/aws-s3-proxy +RUN git checkout v1.4.1 > /dev/null 2>&1 +RUN dep ensure +RUN go build -a -installsuffix cgo -ldflags "-s -w" + +FROM alpine:3.8 + +ENV AWS_REGION=us-east-1 \ + APP_PORT=80 \ + ACCESS_LOG=false \ + CONTENT_ENCODING=true + +RUN apk add --no-cache ca-certificates +COPY --from=build-env /go/src/github.com/pottava/aws-s3-proxy/aws-s3-proxy /aws-s3-proxy +ENTRYPOINT ["/aws-s3-proxy"] diff --git a/docker/windows/1.4/Dockerfile b/docker/windows/1.4/Dockerfile new file mode 100644 index 0000000..fb1fe6c --- /dev/null +++ b/docker/windows/1.4/Dockerfile @@ -0,0 +1,9 @@ +FROM mcr.microsoft.com/windows/nanoserver:10.0.14393.2485 + +ENV AWS_REGION=us-east-1 \ + APP_PORT=80 \ + ACCESS_LOG=false \ + CONTENT_ENCODING=true + +ADD https://github.com/pottava/aws-s3-proxy/releases/download/v1.4.1/windows_amd64.exe proxy.exe +ENTRYPOINT ["C:\\proxy.exe"] diff --git a/prod/Dockerfile b/prod/Dockerfile deleted file mode 100644 index 7be305d..0000000 --- a/prod/Dockerfile +++ /dev/null @@ -1,26 +0,0 @@ -FROM alpine:3.7 - -LABEL com.github.pottava.application="aws-s3-proxy" \ - com.github.pottava.usage="docker run -d -p 8080:80 -e AWS_S3_BUCKET pottava/s3-proxy" \ - com.github.pottava.license="MIT" - -ENV AWS_REGION=us-east-1 \ - APP_PORT=80 - -RUN apk add --no-cache ca-certificates - -RUN apk --no-cache add --virtual build-dependencies gcc musl-dev go git \ - && export GOPATH=/go \ - && export PATH=$GOPATH/bin:$PATH \ - && mkdir $GOPATH \ - && chmod -R 777 $GOPATH \ - && go get -u github.com/pottava/aws-s3-proxy \ - && cd /go/src/github.com/pottava/aws-s3-proxy \ - && go build -ldflags "-s -w" \ - && mv aws-s3-proxy /usr/bin \ - && apk del --purge -r build-dependencies \ - && rm -rf /go - -EXPOSE 80 - -CMD ["aws-s3-proxy"]