Merge pull request #21 from yaegashi/docker-improvement

Docker improvement
This commit is contained in:
Joel Speed 2019-01-21 18:08:51 +00:00 committed by GitHub
commit c922a09ee7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 9 deletions

1
.dockerignore Normal file
View File

@ -0,0 +1 @@
Dockerfile.dev

7
.gitignore vendored
View File

@ -29,3 +29,10 @@ _testmain.go
# Editor swap/temp files # Editor swap/temp files
.*.swp .*.swp
# Dockerfile.dev is ignored by both git and docker
# for faster development cycle of docker build
# cp Dockerfile Dockerfile.dev
# vi Dockerfile.dev
# docker build -f Dockerfile.dev .
Dockerfile.dev

View File

@ -1,18 +1,22 @@
FROM golang:1.11-stretch AS builder FROM golang:1.11-stretch AS builder
WORKDIR /go/src/github.com/pusher/oauth2_proxy
# Download tools
RUN wget -O $GOPATH/bin/dep https://github.com/golang/dep/releases/download/v0.5.0/dep-linux-amd64
RUN chmod +x $GOPATH/bin/dep
# Copy sources
WORKDIR $GOPATH/src/github.com/pusher/oauth2_proxy
COPY . . COPY . .
# Fetch dependencies # Fetch dependencies
RUN wget -O dep https://github.com/golang/dep/releases/download/v0.5.0/dep-linux-amd64
RUN chmod +x dep
RUN mv dep $GOPATH/bin/dep
RUN dep ensure --vendor-only RUN dep ensure --vendor-only
# Build image # Build binary
RUN ./configure && make clean oauth2_proxy RUN ./configure && make build
# Copy binary to debian # Copy binary to alpine
FROM debian:stretch FROM alpine:3.8
RUN apk add --no-cache ca-certificates
COPY --from=builder /go/src/github.com/pusher/oauth2_proxy/oauth2_proxy /bin/oauth2_proxy COPY --from=builder /go/src/github.com/pusher/oauth2_proxy/oauth2_proxy /bin/oauth2_proxy
ENTRYPOINT ["/bin/oauth2_proxy"] ENTRYPOINT ["/bin/oauth2_proxy"]

View File

@ -43,7 +43,7 @@ dep:
build: clean $(BINARY) build: clean $(BINARY)
$(BINARY): $(BINARY):
$(GO) build -ldflags="-X main.VERSION=${VERSION}" -o $(BINARY) github.com/pusher/oauth2_proxy CGO_ENABLED=0 $(GO) build -a -installsuffix cgo -ldflags="-X main.VERSION=${VERSION}" -o $@ github.com/pusher/oauth2_proxy
.PHONY: test .PHONY: test
test: dep lint test: dep lint