diff --git a/Dockerfile b/Dockerfile index 2067877..5993739 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,7 +14,7 @@ RUN go mod download COPY *.go ./ # Build -RUN CGO_ENABLED=0 GOOS=linux go build -o /docker-gs-ping +RUN CGO_ENABLED=0 GOOS=linux go build -o /docker-conifer # To bind to a TCP port, runtime parameters must be supplied to the docker command. # But we can (optionally) document in the Dockerfile what ports @@ -23,4 +23,4 @@ RUN CGO_ENABLED=0 GOOS=linux go build -o /docker-gs-ping EXPOSE 8080 # Run -CMD [ "/docker-gs-ping" ] +CMD [ "/docker-conifer" ] diff --git a/Dockerfile.multistage b/Dockerfile.multistage index 1942ab3..0c066f0 100644 --- a/Dockerfile.multistage +++ b/Dockerfile.multistage @@ -13,7 +13,7 @@ RUN go mod download COPY *.go ./ -RUN CGO_ENABLED=0 GOOS=linux go build -o /docker-gs-ping +RUN CGO_ENABLED=0 GOOS=linux go build -o /docker-conifer ## ## Run the tests in the container @@ -30,10 +30,10 @@ FROM gcr.io/distroless/base-debian11 AS build-release-stage WORKDIR / -COPY --from=build-stage /docker-gs-ping /docker-gs-ping +COPY --from=build-stage /docker-conifer /docker-conifer EXPOSE 8080 USER nonroot:nonroot -ENTRYPOINT ["/docker-gs-ping"] +ENTRYPOINT ["/docker-conifer"] diff --git a/README.md b/README.md index b7e7b66..ec22ee9 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,16 @@ -# docker-gs-ping +# docker-conifer A simple Go server/microservice example for [Docker's Go Language Guide](https://docs.docker.com/language/golang/). Notable features: -* Includes a [multi-stage `Dockerfile`](https://github.com/olliefr/docker-gs-ping/blob/main/Dockerfile.multistage). +* Includes a [multi-stage `Dockerfile`](https://github.com/olliefr/docker-conifer/blob/main/Dockerfile.multistage). * Has a CI pipeline using GitHub Actions to run tests. * Has a CD pipeline using GitHub Actions to publish to Docker Hub. ## Want _moar_?! -There is a more advanced example in [olliefr/docker-gs-ping-roach](https://github.com/olliefr/docker-gs-ping-roach) using [CockroachDB](https://github.com/cockroachdb/cockroach). +There is a more advanced example in [olliefr/docker-conifer-roach](https://github.com/olliefr/docker-conifer-roach) using [CockroachDB](https://github.com/cockroachdb/cockroach). ## Contributing diff --git a/go.mod b/go.mod index ecb8aa3..a7b923b 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/olliefr/docker-gs-ping +module github.com/olliefr/docker-conifer go 1.19 diff --git a/main.go b/main.go index 0ec41fc..cc60529 100644 --- a/main.go +++ b/main.go @@ -16,7 +16,7 @@ func main() { e.Use(middleware.Recover()) e.GET("/", func(c echo.Context) error { - return c.HTML(http.StatusOK, "Hello, Docker! <3") + return c.HTML(http.StatusOK, "Hello, Conifer! <3") }) e.GET("/health", func(c echo.Context) error {