From 2bbb8f51b7a9d9f0102aefd28b83a6225a6b3ff8 Mon Sep 17 00:00:00 2001 From: Julien Bisconti Date: Wed, 26 Jan 2022 18:40:26 +0100 Subject: [PATCH] Update boilerplate (#49) Signed-off-by: Julien Bisconti Co-authored-by: Haytham Abuelfutuh --- datacalog/Dockerfile | 18 ++++++++++++------ datacalog/boilerplate/update.cfg | 1 + 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/datacalog/Dockerfile b/datacalog/Dockerfile index dd2bc9b655..a76c943afa 100644 --- a/datacalog/Dockerfile +++ b/datacalog/Dockerfile @@ -1,31 +1,37 @@ # WARNING: THIS FILE IS MANAGED IN THE 'BOILERPLATE' REPO AND COPIED TO OTHER REPOSITORIES. -# ONLY EDIT THIS FILE FROM WITHIN THE 'LYFT/BOILERPLATE' REPOSITORY: +# ONLY EDIT THIS FILE FROM WITHIN THE 'FLYTEORG/BOILERPLATE' REPOSITORY: # -# TO OPT OUT OF UPDATES, SEE https://github.com/lyft/boilerplate/blob/master/Readme.rst +# TO OPT OUT OF UPDATES, SEE https://github.com/flyteorg/boilerplate/blob/master/Readme.rst FROM golang:1.17.1-alpine3.14 as builder RUN apk add git openssh-client make curl # COPY only the go mod files for efficient caching -COPY go.mod go.sum /go/src/github.com/lyft/datacatalog/ -WORKDIR /go/src/github.com/lyft/datacatalog +COPY go.mod go.sum /go/src/github.com/flyteorg/datacatalog/ +WORKDIR /go/src/github.com/flyteorg/datacatalog # Pull dependencies RUN go mod download # COPY the rest of the source code -COPY . /go/src/github.com/lyft/datacatalog/ +COPY . /go/src/github.com/flyteorg/datacatalog/ # This 'linux_compile' target should compile binaries to the /artifacts directory # The main entrypoint should be compiled to /artifacts/datacatalog RUN make linux_compile +# install grpc-health-probe +RUN curl --silent --fail --show-error --location --output /artifacts/grpc_health_probe "https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/v0.4.5/grpc_health_probe-linux-amd64" && \ + chmod +x /artifacts/grpc_health_probe && \ + echo '8699c46352d752d8f533cae72728b0e65663f399fc28fb9cd854b14ad5f85f44 /artifacts/grpc_health_probe' > .grpc_checksum && \ + sha256sum -c .grpc_checksum + # update the PATH to include the /artifacts directory ENV PATH="/artifacts:${PATH}" # This will eventually move to centurylink/ca-certs:latest for minimum possible image size FROM alpine:3.14 -LABEL org.opencontainers.image.source https://github.com/lyft/datacatalog +LABEL org.opencontainers.image.source https://github.com/flyteorg/datacatalog COPY --from=builder /artifacts /bin diff --git a/datacalog/boilerplate/update.cfg b/datacalog/boilerplate/update.cfg index 9d3bd30565..15359ff796 100644 --- a/datacalog/boilerplate/update.cfg +++ b/datacalog/boilerplate/update.cfg @@ -2,5 +2,6 @@ flyte/docker_build flyte/golang_test_targets flyte/golangci_file flyte/golang_support_tools +flyte/golang_dockerfile flyte/pull_request_template flyte/