From e9d57b3892be20e94a3f8697feee274a87d9ff5a Mon Sep 17 00:00:00 2001 From: Peter Sutherland Date: Mon, 9 Jul 2018 19:09:06 +0100 Subject: [PATCH] Move both examples into single Dockerfile for Docker Hub (fixes #347) Signed-off-by: Peter Sutherland --- examples/random/Dockerfile => Dockerfile | 11 +++++++---- examples/simple/Dockerfile | 20 -------------------- 2 files changed, 7 insertions(+), 24 deletions(-) rename examples/random/Dockerfile => Dockerfile (68%) delete mode 100644 examples/simple/Dockerfile diff --git a/examples/random/Dockerfile b/Dockerfile similarity index 68% rename from examples/random/Dockerfile rename to Dockerfile index 32b6846..a13eb94 100644 --- a/examples/random/Dockerfile +++ b/Dockerfile @@ -4,17 +4,20 @@ # 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 +FROM golang:1 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/random 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. -FROM scratch +FROM prom/busybox LABEL maintainer "The Prometheus Authors " -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 -ENTRYPOINT ["/random"] +CMD echo Please run an example. Either /random or /simple diff --git a/examples/simple/Dockerfile b/examples/simple/Dockerfile deleted file mode 100644 index 99b49d7..0000000 --- a/examples/simple/Dockerfile +++ /dev/null @@ -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 " -COPY --from=builder /go/src/github.com/prometheus/client_golang/examples/simple . -EXPOSE 8080 -ENTRYPOINT ["/simple"]