Merge pull request #21 from yaegashi/docker-improvement
Docker improvement
This commit is contained in:
commit
c922a09ee7
1
.dockerignore
Normal file
1
.dockerignore
Normal file
@ -0,0 +1 @@
|
||||
Dockerfile.dev
|
7
.gitignore
vendored
7
.gitignore
vendored
@ -29,3 +29,10 @@ _testmain.go
|
||||
|
||||
# Editor swap/temp files
|
||||
.*.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
|
||||
|
20
Dockerfile
20
Dockerfile
@ -1,18 +1,22 @@
|
||||
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 . .
|
||||
|
||||
# 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
|
||||
|
||||
# Build image
|
||||
RUN ./configure && make clean oauth2_proxy
|
||||
# Build binary
|
||||
RUN ./configure && make build
|
||||
|
||||
# Copy binary to debian
|
||||
FROM debian:stretch
|
||||
# Copy binary to alpine
|
||||
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
|
||||
|
||||
ENTRYPOINT ["/bin/oauth2_proxy"]
|
||||
|
2
Makefile
2
Makefile
@ -43,7 +43,7 @@ dep:
|
||||
build: clean $(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
|
||||
test: dep lint
|
||||
|
Loading…
Reference in New Issue
Block a user