-
Notifications
You must be signed in to change notification settings - Fork 77
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
refactor docker and change buildkit-syft-scanner reference to ghcr.io
Signed-off-by: kpango <[email protected]>
- Loading branch information
Showing
38 changed files
with
182 additions
and
383 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,17 +15,13 @@ | |
| # limitations under the License. | ||
| # | ||
|
|
||
| # DO_NOT_EDIT this Dockerfile is generated by hack/docker/gen/main.go | ||
|
|
||
| # DO_NOT_EDIT this Dockerfile is generated by https://github.com/vdaas/vald/blob/main/hack/docker/gen/main.go | ||
| ARG UPX_OPTIONS=-9 | ||
| # skipcq: DOK-DL3026,DOK-DL3007 | ||
| FROM ghcr.io/vdaas/vald/vald-buildbase:nightly AS builder | ||
| ARG MAINTAINER="vdaas.org vald team <[email protected]>" | ||
| LABEL maintainer="${MAINTAINER}" | ||
|
|
||
| LABEL maintainer="vdaas.org vald team <[email protected]>" | ||
| # skipcq: DOK-DL3002 | ||
| USER root:root | ||
|
|
||
| ARG TARGETARCH | ||
| ARG TARGETOS | ||
| ARG GO_VERSION | ||
|
|
@@ -43,10 +39,9 @@ ENV REPO=vald | |
| ENV RUST_HOME=/usr/loacl/lib/rust | ||
| ENV TZ=Etc/UTC | ||
| ENV USER=root | ||
| ENV RUSTUP_HOME=${RUST_HOME}/rustup | ||
| ENV CARGO_HOME=${RUST_HOME}/cargo | ||
| ENV RUSTUP_HOME=${RUST_HOME}/rustup | ||
| ENV PATH=${CARGO_HOME}/bin:${RUSTUP_HOME}/bin:/usr/local/bin:${PATH} | ||
|
|
||
| WORKDIR ${HOME}/rust/src/github.com/${ORG}/${REPO} | ||
| SHELL ["/bin/bash", "-o", "pipefail", "-c"] | ||
| #skipcq: DOK-W1001, DOK-SC2046, DOK-SC2086, DOK-DL3008 | ||
|
|
@@ -92,12 +87,8 @@ RUN --mount=type=bind,target=.,rw \ | |
| && rm -rf rust/target | ||
| # skipcq: DOK-DL3026,DOK-DL3007 | ||
| FROM gcr.io/distroless/cc-debian12:nonroot | ||
| ARG MAINTAINER="vdaas.org vald team <[email protected]>" | ||
| LABEL maintainer="${MAINTAINER}" | ||
|
|
||
| ENV APP_NAME=agent | ||
|
|
||
| COPY --from=builder /usr/bin/${APP_NAME} /usr/bin/${APP_NAME} | ||
| LABEL maintainer="vdaas.org vald team <[email protected]>" | ||
| COPY --from=builder /usr/bin/agent /usr/bin/agent | ||
| # skipcq: DOK-DL3002 | ||
| USER nonroot:nonroot | ||
| ENTRYPOINT ["/usr/bin/agent"] | ||
| ENTRYPOINT ["/usr/bin/agent"] | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,17 +15,13 @@ | |
| # limitations under the License. | ||
| # | ||
|
|
||
| # DO_NOT_EDIT this Dockerfile is generated by hack/docker/gen/main.go | ||
|
|
||
| # DO_NOT_EDIT this Dockerfile is generated by https://github.com/vdaas/vald/blob/main/hack/docker/gen/main.go | ||
| ARG UPX_OPTIONS=-9 | ||
| # skipcq: DOK-DL3026,DOK-DL3007 | ||
| FROM ghcr.io/vdaas/vald/vald-buildbase:nightly AS builder | ||
| ARG MAINTAINER="vdaas.org vald team <[email protected]>" | ||
| LABEL maintainer="${MAINTAINER}" | ||
|
|
||
| LABEL maintainer="vdaas.org vald team <[email protected]>" | ||
| # skipcq: DOK-DL3002 | ||
| USER root:root | ||
|
|
||
| ARG TARGETARCH | ||
| ARG TARGETOS | ||
| ARG GO_VERSION | ||
|
|
@@ -46,7 +42,6 @@ ENV REPO=vald | |
| ENV TZ=Etc/UTC | ||
| ENV USER=root | ||
| ENV PATH=${GOPATH}/bin:${GOROOT}/bin:/usr/local/bin:${PATH} | ||
|
|
||
| WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} | ||
| SHELL ["/bin/bash", "-o", "pipefail", "-c"] | ||
| #skipcq: DOK-W1001, DOK-SC2046, DOK-SC2086, DOK-DL3008 | ||
|
|
@@ -93,13 +88,9 @@ RUN --mount=type=bind,target=.,rw \ | |
| && mv "cmd/${PKG}/${APP_NAME}" "/usr/bin/${APP_NAME}" | ||
| # skipcq: DOK-DL3026,DOK-DL3007 | ||
| FROM gcr.io/distroless/static:nonroot | ||
| ARG MAINTAINER="vdaas.org vald team <[email protected]>" | ||
| LABEL maintainer="${MAINTAINER}" | ||
|
|
||
| ENV APP_NAME=faiss | ||
|
|
||
| COPY --from=builder /usr/bin/${APP_NAME} /usr/bin/${APP_NAME} | ||
| LABEL maintainer="vdaas.org vald team <[email protected]>" | ||
| COPY --from=builder /usr/bin/faiss /usr/bin/faiss | ||
| COPY cmd/agent/core/faiss/sample.yaml /etc/server/config.yaml | ||
| # skipcq: DOK-DL3002 | ||
| USER nonroot:nonroot | ||
| ENTRYPOINT ["/usr/bin/faiss"] | ||
| ENTRYPOINT ["/usr/bin/faiss"] | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,17 +15,13 @@ | |
| # limitations under the License. | ||
| # | ||
|
|
||
| # DO_NOT_EDIT this Dockerfile is generated by hack/docker/gen/main.go | ||
|
|
||
| # DO_NOT_EDIT this Dockerfile is generated by https://github.com/vdaas/vald/blob/main/hack/docker/gen/main.go | ||
| ARG UPX_OPTIONS=-9 | ||
| # skipcq: DOK-DL3026,DOK-DL3007 | ||
| FROM ghcr.io/vdaas/vald/vald-buildbase:nightly AS builder | ||
| ARG MAINTAINER="vdaas.org vald team <[email protected]>" | ||
| LABEL maintainer="${MAINTAINER}" | ||
|
|
||
| LABEL maintainer="vdaas.org vald team <[email protected]>" | ||
| # skipcq: DOK-DL3002 | ||
| USER root:root | ||
|
|
||
| ARG TARGETARCH | ||
| ARG TARGETOS | ||
| ARG GO_VERSION | ||
|
|
@@ -46,7 +42,6 @@ ENV REPO=vald | |
| ENV TZ=Etc/UTC | ||
| ENV USER=root | ||
| ENV PATH=${GOPATH}/bin:${GOROOT}/bin:/usr/local/bin:${PATH} | ||
|
|
||
| WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} | ||
| SHELL ["/bin/bash", "-o", "pipefail", "-c"] | ||
| #skipcq: DOK-W1001, DOK-SC2046, DOK-SC2086, DOK-DL3008 | ||
|
|
@@ -92,13 +87,9 @@ RUN --mount=type=bind,target=.,rw \ | |
| && mv "cmd/${PKG}/${APP_NAME}" "/usr/bin/${APP_NAME}" | ||
| # skipcq: DOK-DL3026,DOK-DL3007 | ||
| FROM gcr.io/distroless/static:nonroot | ||
| ARG MAINTAINER="vdaas.org vald team <[email protected]>" | ||
| LABEL maintainer="${MAINTAINER}" | ||
|
|
||
| ENV APP_NAME=ngt | ||
|
|
||
| COPY --from=builder /usr/bin/${APP_NAME} /usr/bin/${APP_NAME} | ||
| LABEL maintainer="vdaas.org vald team <[email protected]>" | ||
| COPY --from=builder /usr/bin/ngt /usr/bin/ngt | ||
| COPY cmd/agent/core/ngt/sample.yaml /etc/server/config.yaml | ||
| # skipcq: DOK-DL3002 | ||
| USER nonroot:nonroot | ||
| ENTRYPOINT ["/usr/bin/ngt"] | ||
| ENTRYPOINT ["/usr/bin/ngt"] | ||
Oops, something went wrong.