Move both examples into single Dockerfile for Docker Hub (fixes #347)
Signed-off-by: Peter Sutherland <peter@pedrosland.co.uk>
This commit is contained in:
parent
d6a9817c4a
commit
e9d57b3892
|
@ -4,17 +4,20 @@
|
||||||
# docker build -f examples/$name/Dockerfile -t prometheus/golang-example-$name .
|
# docker build -f examples/$name/Dockerfile -t prometheus/golang-example-$name .
|
||||||
|
|
||||||
# Builder image, where we build the example.
|
# Builder image, where we build the example.
|
||||||
FROM golang:1.9.0 AS builder
|
FROM golang:1 AS builder
|
||||||
WORKDIR /go/src/github.com/prometheus/client_golang
|
WORKDIR /go/src/github.com/prometheus/client_golang
|
||||||
COPY . .
|
COPY . .
|
||||||
WORKDIR /go/src/github.com/prometheus/client_golang/prometheus
|
WORKDIR /go/src/github.com/prometheus/client_golang/prometheus
|
||||||
RUN go get -d
|
RUN go get -d
|
||||||
WORKDIR /go/src/github.com/prometheus/client_golang/examples/random
|
WORKDIR /go/src/github.com/prometheus/client_golang/examples/random
|
||||||
RUN CGO_ENABLED=0 GOOS=linux go build -a -tags netgo -ldflags '-w'
|
RUN CGO_ENABLED=0 GOOS=linux go build -a -tags netgo -ldflags '-w'
|
||||||
|
WORKDIR /go/src/github.com/prometheus/client_golang/examples/simple
|
||||||
|
RUN CGO_ENABLED=0 GOOS=linux go build -a -tags netgo -ldflags '-w'
|
||||||
|
|
||||||
# Final image.
|
# Final image.
|
||||||
FROM scratch
|
FROM prom/busybox
|
||||||
LABEL maintainer "The Prometheus Authors <prometheus-developers@googlegroups.com>"
|
LABEL maintainer "The Prometheus Authors <prometheus-developers@googlegroups.com>"
|
||||||
COPY --from=builder /go/src/github.com/prometheus/client_golang/examples/random .
|
COPY --from=builder /go/src/github.com/prometheus/client_golang/examples/random \
|
||||||
|
/go/src/github.com/prometheus/client_golang/examples/simple ./
|
||||||
EXPOSE 8080
|
EXPOSE 8080
|
||||||
ENTRYPOINT ["/random"]
|
CMD echo Please run an example. Either /random or /simple
|
|
@ -1,20 +0,0 @@
|
||||||
# This Dockerfile builds an image for a client_golang example.
|
|
||||||
#
|
|
||||||
# Use as (from the root for the client_golang repository):
|
|
||||||
# docker build -f examples/$name/Dockerfile -t prometheus/golang-example-$name .
|
|
||||||
|
|
||||||
# Builder image, where we build the example.
|
|
||||||
FROM golang:1.9.0 AS builder
|
|
||||||
WORKDIR /go/src/github.com/prometheus/client_golang
|
|
||||||
COPY . .
|
|
||||||
WORKDIR /go/src/github.com/prometheus/client_golang/prometheus
|
|
||||||
RUN go get -d
|
|
||||||
WORKDIR /go/src/github.com/prometheus/client_golang/examples/simple
|
|
||||||
RUN CGO_ENABLED=0 GOOS=linux go build -a -tags netgo -ldflags '-w'
|
|
||||||
|
|
||||||
# Final image.
|
|
||||||
FROM scratch
|
|
||||||
LABEL maintainer "The Prometheus Authors <prometheus-developers@googlegroups.com>"
|
|
||||||
COPY --from=builder /go/src/github.com/prometheus/client_golang/examples/simple .
|
|
||||||
EXPOSE 8080
|
|
||||||
ENTRYPOINT ["/simple"]
|
|
Loading…
Reference in New Issue