From 035da014560beb7b04a6384ce43b748b28801a3b Mon Sep 17 00:00:00 2001 From: kpango Date: Sat, 27 Jul 2024 06:37:49 +0900 Subject: [PATCH] update deps Signed-off-by: kpango --- .github/actions/setup-e2e/action.yaml | 2 +- .github/actions/setup-k3d/action.yaml | 25 +++- .github/workflows/e2e-chaos.yaml | 18 ++- .github/workflows/e2e-max-dim.yml | 6 +- .github/workflows/e2e-profiling.yml | 6 +- .github/workflows/e2e.yml | 34 +++-- .github/workflows/helm.yml | 3 + Makefile | 43 ++++-- Makefile.d/dependencies.mk | 12 +- Makefile.d/docker.mk | 6 - Makefile.d/k3d.mk | 8 +- Makefile.d/tools.mk | 7 +- dockers/agent/core/agent/Dockerfile | 33 ++++- dockers/agent/core/faiss/Dockerfile | 31 ++++- dockers/agent/core/ngt/Dockerfile | 31 ++++- dockers/agent/sidecar/Dockerfile | 29 +++- dockers/ci/base/Dockerfile | 62 +++++++-- dockers/dev/Dockerfile | 46 +++++-- dockers/discoverer/k8s/Dockerfile | 29 +++- dockers/gateway/filter/Dockerfile | 29 +++- dockers/gateway/lb/Dockerfile | 29 +++- dockers/gateway/mirror/Dockerfile | 29 +++- dockers/index/job/correction/Dockerfile | 29 +++- dockers/index/job/creation/Dockerfile | 29 +++- .../index/job/readreplica/rotate/Dockerfile | 29 +++- dockers/index/job/save/Dockerfile | 29 +++- dockers/index/operator/Dockerfile | 29 +++- dockers/manager/index/Dockerfile | 29 +++- dockers/operator/helm/Dockerfile | 31 ++++- dockers/tools/benchmark/job/Dockerfile | 31 ++++- dockers/tools/benchmark/operator/Dockerfile | 29 +++- dockers/tools/cli/loadtest/Dockerfile | 31 ++++- go.mod | 42 +++--- go.sum | 44 +++--- hack/docker/gen/main.go | 130 ++++++++++++++---- hack/go.mod.default | 16 +-- .../core/ngt/handler/grpc/search_test.go | 3 +- rust/Cargo.lock | 4 +- versions/CMAKE_VERSION | 1 + versions/OPERATOR_SDK_VERSION | 2 +- versions/PROMETHEUS_STACK_VERSION | 2 +- 41 files changed, 814 insertions(+), 244 deletions(-) create mode 100644 versions/CMAKE_VERSION diff --git a/.github/actions/setup-e2e/action.yaml b/.github/actions/setup-e2e/action.yaml index f2c11c0aec..e3a18d35de 100644 --- a/.github/actions/setup-e2e/action.yaml +++ b/.github/actions/setup-e2e/action.yaml @@ -19,7 +19,7 @@ inputs: require_libhdf5: description: "If libhdf5 is not required, set this to false" required: false - default: "true" + default: "false" require_go: description: "If go is not required, set this to false" required: false diff --git a/.github/actions/setup-k3d/action.yaml b/.github/actions/setup-k3d/action.yaml index 48f7556818..618a04c9fe 100644 --- a/.github/actions/setup-k3d/action.yaml +++ b/.github/actions/setup-k3d/action.yaml @@ -93,9 +93,32 @@ runs: shell: bash id: start_k3d run: | - k3d cluster create ${{ inputs.name }} ${{ steps.k3d_options.outputs.options }} + k3d cluster create ${{ inputs.name }} ${{ steps.k3d_options.outputs.options }} \ + --image docker.io/rancher/k3s:latest \ + --host-pid-mode=true \ + --k3s-arg "--disable=traefik@server:*" \ + --api-port 0.0.0.0:6443 \ + -v "/lib/modules:/lib/modules" + k3d cluster start ${{ inputs.name }} + k3d kubeconfig merge ${{ inputs.name }} --kubeconfig-switch-context - name: Ready k8s cluster shell: bash run: | k3d cluster list + server="k3d-${{ inputs.name }}-server-0" + docker logs ${server} + docker inspect ${server} + - name: Set k3d cluster config to KUBECONFIG + shell: bash + run: | + echo "KUBECONFIG=$(k3d kubeconfig write ${{ inputs.name }})" >> $GITHUB_ENV + - name: Check KUBECONFIG environment variable + shell: bash + run: | + echo $KUBECONFIG + cat $KUBECONFIG + cat /etc/hosts + - name: Show Kubernetes Cluster Info + shell: bash + run: | kubectl cluster-info dump diff --git a/.github/workflows/e2e-chaos.yaml b/.github/workflows/e2e-chaos.yaml index d571227e1f..ed93101f73 100644 --- a/.github/workflows/e2e-chaos.yaml +++ b/.github/workflows/e2e-chaos.yaml @@ -35,11 +35,15 @@ jobs: steps: - uses: actions/checkout@v4 - uses: ./.github/actions/dump-context + detect-ci-container: + uses: ./.github/workflows/_detect-ci-container.yml agent-failure: name: "E2E chaos test (Agent failure: to test insert/search works even if one of the agents is failing)" - needs: [dump-contexts-to-log] + needs: [detect-ci-container] runs-on: ubuntu-latest timeout-minutes: 60 + container: + image: ghcr.io/vdaas/vald/vald-ci-container:${{ needs.detect-ci-container.outputs.TAG }} steps: - uses: actions/checkout@v4 - name: Set Git config @@ -75,9 +79,11 @@ jobs: e2e/insert/search random-pod-failure: name: "E2E chaos test (random Pod failure: to test redundancy)" - needs: [dump-contexts-to-log] + needs: [detect-ci-container] runs-on: ubuntu-latest timeout-minutes: 60 + container: + image: ghcr.io/vdaas/vald/vald-ci-container:${{ needs.detect-ci-container.outputs.TAG }} steps: - uses: actions/checkout@v4 - name: Set Git config @@ -113,9 +119,11 @@ jobs: e2e/insert/search agent-network-partition: name: "E2E chaos test (agent network partition: to test retries)" - needs: [dump-contexts-to-log] + needs: [detect-ci-container] runs-on: ubuntu-latest timeout-minutes: 60 + container: + image: ghcr.io/vdaas/vald/vald-ci-container:${{ needs.detect-ci-container.outputs.TAG }} steps: - uses: actions/checkout@v4 - name: Set Git config @@ -151,9 +159,11 @@ jobs: e2e/insert/search clusterwide-network-bandwidth: name: "E2E chaos test (network bandwidth: to test it works properly under bandwidth limitation)" - needs: [dump-contexts-to-log] + needs: [detect-ci-container] runs-on: ubuntu-latest timeout-minutes: 60 + container: + image: ghcr.io/vdaas/vald/vald-ci-container:${{ needs.detect-ci-container.outputs.TAG }} steps: - uses: actions/checkout@v4 - name: Set Git config diff --git a/.github/workflows/e2e-max-dim.yml b/.github/workflows/e2e-max-dim.yml index ef2b137547..00bf9e5360 100644 --- a/.github/workflows/e2e-max-dim.yml +++ b/.github/workflows/e2e-max-dim.yml @@ -32,11 +32,15 @@ jobs: steps: - uses: actions/checkout@v4 - uses: ./.github/actions/dump-context + detect-ci-container: + uses: ./.github/workflows/_detect-ci-container.yml e2e-max-dimension-insert: name: "E2E test (Max Dimension Insert: skip strict exist check)" - needs: [dump-contexts-to-log] + needs: [detect-ci-container] runs-on: ubuntu-latest timeout-minutes: 60 + container: + image: ghcr.io/vdaas/vald/vald-ci-container:${{ needs.detect-ci-container.outputs.TAG }} steps: - uses: actions/checkout@v4 - name: Set Git config diff --git a/.github/workflows/e2e-profiling.yml b/.github/workflows/e2e-profiling.yml index d54c79722d..38b0d9332a 100644 --- a/.github/workflows/e2e-profiling.yml +++ b/.github/workflows/e2e-profiling.yml @@ -33,11 +33,15 @@ jobs: steps: - uses: actions/checkout@v4 - uses: ./.github/actions/dump-context + detect-ci-container: + uses: ./.github/workflows/_detect-ci-container.yml e2e-profiling: name: "E2E profiling" - needs: [dump-contexts-to-log] + needs: [detect-ci-container] runs-on: ubuntu-latest timeout-minutes: 60 + container: + image: ghcr.io/vdaas/vald/vald-ci-container:${{ needs.detect-ci-container.outputs.TAG }} steps: - uses: actions/checkout@v4 - name: Set Git config diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 780ddd8b66..104878d243 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -33,11 +33,15 @@ jobs: steps: - uses: actions/checkout@v4 - uses: ./.github/actions/dump-context + detect-ci-container: + uses: ./.github/workflows/_detect-ci-container.yml e2e-stream-crud: name: "E2E test (Stream CRUD)" - needs: [dump-contexts-to-log] + needs: [detect-ci-container] runs-on: ubuntu-latest timeout-minutes: 60 + container: + image: ghcr.io/vdaas/vald/vald-ci-container:${{ needs.detect-ci-container.outputs.TAG }} steps: - uses: actions/checkout@v4 - name: Set Git config @@ -73,9 +77,11 @@ jobs: POD_NAME: ${{ steps.deploy_vald.outputs.POD_NAME }} e2e-stream-crud-for-operator: name: "E2E test (Stream CRUD) for operator" - needs: [dump-contexts-to-log] + needs: [detect-ci-container] runs-on: ubuntu-latest timeout-minutes: 60 + container: + image: ghcr.io/vdaas/vald/vald-ci-container:${{ needs.detect-ci-container.outputs.TAG }} steps: - uses: actions/checkout@v4 - name: Set Git config @@ -133,9 +139,11 @@ jobs: POD_NAME: ${{ steps.deploy_vald.outputs.POD_NAME }} e2e-stream-crud-under-index-management-jobs: name: "E2E test (Stream CRUD) under index management jobs" - needs: [dump-contexts-to-log] + needs: [detect-ci-container] runs-on: ubuntu-latest timeout-minutes: 60 + container: + image: ghcr.io/vdaas/vald/vald-ci-container:${{ needs.detect-ci-container.outputs.TAG }} steps: - uses: actions/checkout@v4 - name: Set Git config @@ -175,9 +183,11 @@ jobs: POD_NAME: ${{ steps.deploy_vald.outputs.POD_NAME }} e2e-stream-crud-skip-exist-check: name: "E2E test (Stream CRUD: skip strict exist check)" - needs: [dump-contexts-to-log] + needs: [detect-ci-container] runs-on: ubuntu-latest timeout-minutes: 60 + container: + image: ghcr.io/vdaas/vald/vald-ci-container:${{ needs.detect-ci-container.outputs.TAG }} steps: - uses: actions/checkout@v4 - name: Set Git config @@ -213,9 +223,11 @@ jobs: POD_NAME: ${{ steps.deploy_vald.outputs.POD_NAME }} e2e-multiapis-crud: name: "E2E test (Multi-APIs CRUD)" - needs: [dump-contexts-to-log] + needs: [detect-ci-container] runs-on: ubuntu-latest timeout-minutes: 60 + container: + image: ghcr.io/vdaas/vald/vald-ci-container:${{ needs.detect-ci-container.outputs.TAG }} steps: - uses: actions/checkout@v4 - name: Set Git config @@ -247,9 +259,11 @@ jobs: POD_NAME: ${{ steps.deploy_vald.outputs.POD_NAME }} e2e-jobs: name: "E2E test (Jobs)" - needs: [dump-contexts-to-log] + needs: [detect-ci-container] runs-on: ubuntu-latest timeout-minutes: 60 + container: + image: ghcr.io/vdaas/vald/vald-ci-container:${{ needs.detect-ci-container.outputs.TAG }} steps: - uses: actions/checkout@v4 - name: Set Git config @@ -278,9 +292,11 @@ jobs: POD_NAME: ${{ steps.deploy_vald.outputs.POD_NAME }} e2e-stream-crud-with-readreplica: name: "E2E test (Stream CRUD) with read replica" - needs: [dump-contexts-to-log] + needs: [detect-ci-container] runs-on: ubuntu-latest timeout-minutes: 60 + container: + image: ghcr.io/vdaas/vald/vald-ci-container:${{ needs.detect-ci-container.outputs.TAG }} steps: - uses: actions/checkout@v4 - name: Set Git config @@ -326,9 +342,11 @@ jobs: POD_NAME: ${{ steps.deploy_vald_readreplica.outputs.POD_NAME }} e2e-stream-crud-with-mirror: name: "E2E test (Stream CRUD) with mirror" - needs: [dump-contexts-to-log] + needs: [detect-ci-container] runs-on: ubuntu-latest timeout-minutes: 60 + container: + image: ghcr.io/vdaas/vald/vald-ci-container:${{ needs.detect-ci-container.outputs.TAG }} steps: - uses: actions/checkout@v4 - name: Set Git config diff --git a/.github/workflows/helm.yml b/.github/workflows/helm.yml index f72f943530..a360808379 100644 --- a/.github/workflows/helm.yml +++ b/.github/workflows/helm.yml @@ -75,6 +75,9 @@ jobs: name: CRUD test on remote Helm chart runs-on: ubuntu-latest timeout-minutes: 60 + needs: [detect-ci-container] + container: + image: ghcr.io/vdaas/vald/vald-ci-container:${{ needs.detect-ci-container.outputs.TAG }} steps: - uses: actions/checkout@v4 - name: Set Git config diff --git a/Makefile b/Makefile index 9986a575ac..790f6fd080 100644 --- a/Makefile +++ b/Makefile @@ -77,7 +77,8 @@ CARGO_HOME ?= $(RUST_HOME)/cargo RUST_VERSION := $(eval RUST_VERSION := $(shell cat versions/RUST_VERSION))$(RUST_VERSION) BUF_VERSION := $(eval BUF_VERSION := $(shell cat versions/BUF_VERSION))$(BUF_VERSION) -DOCKER_VERSION := $(eval DOCKER_VERSION := $(shell cat versions/DOCKER_VERSION))$(DOCKER_VERSION) +CMAKE_VERSION := $(eval CMAKE_VERSION := $(shell cat versions/CMAKE_VERSION))$(CMAKE_VERSION) +DOCKER_VERSION := $(eval DOCKER_VERSION := $(shell cat versions/DOCKER_VERSION))$(DOCKER_VERSION) FAISS_VERSION := $(eval FAISS_VERSION := $(shell cat versions/FAISS_VERSION))$(FAISS_VERSION) GOLANGCILINT_VERSION := $(eval GOLANGCILINT_VERSION := $(shell cat versions/GOLANGCILINT_VERSION))$(GOLANGCILINT_VERSION) HDF5_VERSION := $(eval HDF5_VERSION := $(shell cat versions/HDF5_VERSION))$(HDF5_VERSION) @@ -139,7 +140,7 @@ PBGOS = $(PROTOS:apis/proto/%.proto=apis/grpc/%.pb.go) SWAGGERS = $(PROTOS:apis/proto/%.proto=apis/swagger/%.swagger.json) PBDOCS = apis/docs/v1/docs.md -LDFLAGS = -static -fPIC -pthread -std=gnu++20 -lstdc++ -lm -z relro -z now -flto=auto -march=native -mtune=native -fno-plt -Ofast -fvisibility=hidden -ffp-contract=fast -fomit-frame-pointer -fmerge-all-constants -funroll-loops -falign-functions=32 -ffunction-sections -fdata-sections +LDFLAGS = -static -fPIC -pthread -std=gnu++23 -lstdc++ -lm -z relro -z now -flto=auto -march=native -mtune=native -fno-plt -Ofast -fvisibility=hidden -ffp-contract=fast -fomit-frame-pointer -fmerge-all-constants -funroll-loops -falign-functions=32 -ffunction-sections -fdata-sections NGT_LDFLAGS = -fopenmp -lopenblas -llapack FAISS_LDFLAGS = $(NGT_LDFLAGS) -lgfortran @@ -150,17 +151,14 @@ ifeq ($(GOARCH),amd64) CFLAGS ?= -mno-avx512f -mno-avx512dq -mno-avx512cd -mno-avx512bw -mno-avx512vl CXXFLAGS ?= $(CFLAGS) EXTLDFLAGS ?= -m64 -NGT_EXTRA_FLAGS ?= else ifeq ($(GOARCH),arm64) CFLAGS ?= CXXFLAGS ?= $(CFLAGS) EXTLDFLAGS ?= -march=armv8-a -NGT_EXTRA_FLAGS ?= else CFLAGS ?= CXXFLAGS ?= $(CFLAGS) EXTLDFLAGS ?= -NGT_EXTRA_FLAGS ?= endif BENCH_DATASET_MD5S := $(eval BENCH_DATASET_MD5S := $(shell find $(BENCH_DATASET_MD5_DIR) -type f -regex ".*\.md5"))$(BENCH_DATASET_MD5S) @@ -622,9 +620,9 @@ $(USR_LOCAL)/include/NGT/Capi.h: -DCMAKE_C_FLAGS="$(CFLAGS)" \ -DCMAKE_CXX_FLAGS="$(CXXFLAGS)" \ -DCMAKE_INSTALL_PREFIX=$(USR_LOCAL) \ - "$(NGT_EXTRA_FLAGS)" . - make -j$(CORES) -C $(TEMP_DIR)/NGT-$(NGT_VERSION) - make install -C $(TEMP_DIR)/NGT-$(NGT_VERSION) + -B $(TEMP_DIR)/NGT-$(NGT_VERSION)/build $(TEMP_DIR)/NGT-$(NGT_VERSION) + make -C $(TEMP_DIR)/NGT-$(NGT_VERSION)/build -j$(CORES) ngt + make -C $(TEMP_DIR)/NGT-$(NGT_VERSION)/build install cd $(ROOTDIR) rm -rf $(TEMP_DIR)/NGT-$(NGT_VERSION) ldconfig @@ -646,12 +644,31 @@ $(LIB_PATH)/libfaiss.a: -DFAISS_ENABLE_GPU=OFF \ -DBLA_VENDOR=OpenBLAS \ -DCMAKE_EXE_LINKER_FLAGS="$(FAISS_LDFLAGS)" \ - -B build . && \ - make -C build -j$(CORES) faiss && \ - make -C build install - rm -rf v$(FAISS_VERSION).tar.gz - rm -rf $(TEMP_DIR)/faiss-$(FAISS_VERSION) + -B $(TEMP_DIR)/faiss-$(FAISS_VERSION)/build $(TEMP_DIR)/faiss-$(FAISS_VERSION) + make -C $(TEMP_DIR)/faiss-$(FAISS_VERSION)/build -j$(CORES) faiss + make -C $(TEMP_DIR)/faiss-$(FAISS_VERSION)/build install + cd $(ROOTDIR) + rm -rf $(TEMP_DIR)/v$(FAISS_VERSION).tar.gz $(TEMP_DIR)/faiss-$(FAISS_VERSION) + ldconfig + +.PHONY: cmake/install +## install CMAKE +cmake/install: + git clone --depth 1 --branch v$(CMAKE_VERSION) https://github.com/Kitware/CMake.git $(TEMP_DIR)/CMAKE-$(CMAKE_VERSION) + cd $(TEMP_DIR)/CMAKE-$(CMAKE_VERSION) && \ + cmake -DCMAKE_BUILD_TYPE=Release \ + -DBUILD_SHARED_LIBS=OFF \ + -DBUILD_TESTING=OFF \ + -DCMAKE_C_FLAGS="$(CFLAGS)" \ + -DCMAKE_CXX_FLAGS="$(CXXFLAGS)" \ + -DCMAKE_INSTALL_PREFIX=$(USR_LOCAL) \ + -B $(TEMP_DIR)/CMAKE-$(CMAKE_VERSION)/build $(TEMP_DIR)/CMAKE-$(CMAKE_VERSION) + make -C $(TEMP_DIR)/CMAKE-$(CMAKE_VERSION)/build -j$(CORES) cmake + make -C $(TEMP_DIR)/CMAKE-$(CMAKE_VERSION)/build install + cd $(ROOTDIR) + rm -rf $(TEMP_DIR)/CMAKE-$(CMAKE_VERSION) ldconfig + # -DCMAKE_USE_OPENSSL=OFF .PHONY: lint ## run lints diff --git a/Makefile.d/dependencies.mk b/Makefile.d/dependencies.mk index 8e01f2fb07..a02af6c6d6 100644 --- a/Makefile.d/dependencies.mk +++ b/Makefile.d/dependencies.mk @@ -18,9 +18,12 @@ ## update vald libraries including tools update/libs: \ update/chaos-mesh \ + update/cmake \ + update/docker \ update/faiss \ update/go \ update/golangci-lint \ + update/hdf5 \ update/helm \ update/helm-docs \ update/helm-operator \ @@ -33,12 +36,12 @@ update/libs: \ update/prometheus-stack \ update/protobuf \ update/reviewdog \ + update/rust \ update/telepresence \ update/vald \ update/valdcli \ update/yq \ - update/zlib \ - update/hdf5 + update/zlib .PHONY: go/download ## download Go package dependencies @@ -186,6 +189,11 @@ update/ngt: update/faiss: curl -fsSL https://api.github.com/repos/facebookresearch/faiss/releases/latest | grep -Po '"tag_name": "\K.*?(?=")' | sed 's/v//g' > $(ROOTDIR)/versions/FAISS_VERSION +.PHONY: update/cmake +## update CMAKE version +update/cmake: + curl -fsSL https://api.github.com/repos/Kitware/CMAKE/releases/latest | grep -Po '"tag_name": "\K.*?(?=")' | sed 's/v//g' > $(ROOTDIR)/versions/CMAKE_VERSION + .PHONY: update/reviewdog ## update reviewdog version update/reviewdog: diff --git a/Makefile.d/docker.mk b/Makefile.d/docker.mk index 540eca3eb4..1e62d969a6 100644 --- a/Makefile.d/docker.mk +++ b/Makefile.d/docker.mk @@ -53,8 +53,6 @@ ifeq ($(REMOTE),true) --build-arg BUILDKIT_INLINE_CACHE=$(BUILDKIT_INLINE_CACHE) \ --build-arg GO_VERSION=$(GO_VERSION) \ --build-arg RUST_VERSION=$(RUST_VERSION) \ - --build-arg DISTROLESS_IMAGE=$(DISTROLESS_IMAGE) \ - --build-arg DISTROLESS_IMAGE_TAG=$(DISTROLESS_IMAGE_TAG) \ --build-arg MAINTAINER=$(MAINTAINER) \ --sbom=true \ --provenance=mode=max \ @@ -70,8 +68,6 @@ else --build-arg BUILDKIT_INLINE_CACHE=$(BUILDKIT_INLINE_CACHE) \ --build-arg GO_VERSION=$(GO_VERSION) \ --build-arg RUST_VERSION=$(RUST_VERSION) \ - --build-arg DISTROLESS_IMAGE=$(DISTROLESS_IMAGE) \ - --build-arg DISTROLESS_IMAGE_TAG=$(DISTROLESS_IMAGE_TAG) \ --build-arg MAINTAINER=$(MAINTAINER) \ $(EXTRA_ARGS) \ -t $(CRORG)/$(IMAGE):$(TAG) \ @@ -120,8 +116,6 @@ docker/name/agent: docker/build/agent: @make DOCKERFILE="$(ROOTDIR)/dockers/agent/core/agent/Dockerfile" \ IMAGE=$(AGENT_IMAGE) \ - DISTROLESS_IMAGE=gcr.io/distroless/cc-debian12 \ - EXTRA_ARGS="--build-arg RUST_VERSION=$(RUST_VERSION)" \ docker/build/image .PHONY: docker/name/discoverer-k8s diff --git a/Makefile.d/k3d.mk b/Makefile.d/k3d.mk index 7449df203c..c446cd6d9a 100644 --- a/Makefile.d/k3d.mk +++ b/Makefile.d/k3d.mk @@ -36,10 +36,12 @@ k3d/start: --host-pid-mode=true \ --port 8081:80@loadbalancer \ --k3s-arg "--disable=traefik@server:*" \ + --api-port 0.0.0.0:6443 \ -v "/lib/modules:/lib/modules" - # $(K3D_COMMAND) cluster create $(K3D_CLUSTER_NAME) --agents $(K3D_NODES) -v "/lib/modules:/lib/modules" - # $(K3D_COMMAND) cluster create $(K3D_CLUSTER_NAME) -p "8081:80@loadbalancer" --agents $(K3D_NODES) --k3s-arg '--disable=traefik@all' - export KUBECONFIG="$(shell sudo $(K3D_COMMAND) kubeconfig merge -o $(TEMP_DIR)/k3d_$(K3D_CLUSTER_NAME)_kubeconfig.yaml $(K3D_CLUSTER_NAME))" + export KUBECONFIG="$(shell $(K3D_COMMAND) kubeconfig merge -o $(TEMP_DIR)/k3d_$(K3D_CLUSTER_NAME)_kubeconfig.yaml $(K3D_CLUSTER_NAME)) --kubeconfig-switch-context" + docker logs k3d-$(K3D_CLUSTER_NAME)-server-0 + docker inspect k3d-$(K3D_CLUSTER_NAME)-server-0 + kubectl cluster-info dump .PHONY: k3d/restart ## restart k3d (kubernetes in docker) cluster diff --git a/Makefile.d/tools.mk b/Makefile.d/tools.mk index 59b06c60d7..ec8ef777b1 100644 --- a/Makefile.d/tools.mk +++ b/Makefile.d/tools.mk @@ -53,9 +53,10 @@ $(GOBIN)/crlfmt: $(call go-install, github.com/cockroachdb/crlfmt) .PHONY: prettier/install -prettier/install: $(BINDIR)/prettier -$(BINDIR)/prettier: - npm config set registry http://registry.npmjs.org/ +prettier/install: $(NPM_GLOBAL_PREFIX)/bin/prettier +$(NPM_GLOBAL_PREFIX)/bin/prettier: + npm config -g set registry http://registry.npmjs.org/ + npm cache clean --force type prettier || npm install -g prettier .PHONY: reviewdog/install diff --git a/dockers/agent/core/agent/Dockerfile b/dockers/agent/core/agent/Dockerfile index c13f258679..9b6801ed1e 100644 --- a/dockers/agent/core/agent/Dockerfile +++ b/dockers/agent/core/agent/Dockerfile @@ -18,11 +18,14 @@ # DO_NOT_EDIT this Dockerfile is generated by hack/docker/gen/main.go ARG UPX_OPTIONS=-9 -# skipcq: DOK-DL3026 +# skipcq: DOK-DL3026,DOK-DL3007 FROM ghcr.io/vdaas/vald/vald-buildbase:nightly AS builder ARG MAINTAINER="vdaas.org vald team " LABEL maintainer="${MAINTAINER}" +# skipcq: DOK-DL3002 +USER root:root + ARG TARGETARCH ARG TARGETOS ARG GO_VERSION @@ -32,17 +35,24 @@ ENV DEBIAN_FRONTEND=noninteractive ENV HOME=/root ENV INITRD=No ENV LANG=en_US.UTF-8 +ENV LANGUAGE=en_US.UTF-8 +ENV LC_ALL=en_US.UTF-8 ENV ORG=vdaas ENV PKG=agent/core/agent ENV REPO=vald ENV RUST_HOME=/usr/loacl/lib/rust -ENV RUSTUP_HOME=${RUST_HOME}/rustup +ENV TZ=Etc/UTC +ENV USER=root ENV CARGO_HOME=${RUST_HOME}/cargo +ENV RUSTUP_HOME=${RUST_HOME}/rustup ENV PATH=${CARGO_HOME}/bin:${RUSTUP_HOME}/bin:/usr/local/bin:${PATH} SHELL ["/bin/bash", "-o", "pipefail", "-c"] # skipcq: DOK-DL3008 -RUN apt-get clean \ +RUN rm -f /etc/apt/apt.conf.d/docker-clean \ + && echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache \ + && echo 'APT::Install-Recommends "false";' > /etc/apt/apt.conf.d/no-install-recommends \ + && apt-get clean \ && rm -rf \ /var/lib/apt/lists/* \ /var/cache/* \ @@ -53,20 +63,28 @@ RUN apt-get clean \ ca-certificates \ curl \ git \ + tzdata \ + locales \ cmake \ - g++ \ gcc \ + g++ \ unzip \ liblapack-dev \ libomp-dev \ libopenblas-dev \ gfortran \ && ldconfig \ + && echo "${LANG} UTF-8" > /etc/locale.gen \ + && ln -fs /usr/share/zoneinfo/${TZ} /etc/localtime \ + && locale-gen ${LANGUAGE} \ + && update-locale LANG=${LANGUAGE} \ + && dpkg-reconfigure -f noninteractive tzdata \ && apt-get clean \ + && apt-get autoclean -y \ && rm -rf \ /var/lib/apt/lists/* \ /var/cache/* \ - && apt-get autoremove + && apt-get autoremove -y WORKDIR ${HOME}/rust/src/github.com/${ORG}/${REPO} COPY Makefile . @@ -79,14 +97,14 @@ WORKDIR ${HOME}/rust/src/github.com/${ORG}/${REPO}/rust COPY rust . WORKDIR ${HOME}/rust/src/github.com/${ORG}/${REPO} -#skipcq: DOK-W1001, DOK-SC2086 +#skipcq: DOK-W1001, DOK-SC2086, DOK-DL3008 RUN make RUST_VERSION="${RUST_VERSION}" rust/install \ && make ngt/install \ && make faiss/install \ && make rust/target/release/${APP_NAME} \ && mv "rust/target/release/${APP_NAME}" "/usr/bin/${APP_NAME}" \ && rm -rf rust/target -# skipcq: DOK-DL3026 +# skipcq: DOK-DL3026,DOK-DL3007 FROM gcr.io/distroless/cc-debian12:nonroot ARG MAINTAINER="vdaas.org vald team " LABEL maintainer="${MAINTAINER}" @@ -94,5 +112,6 @@ LABEL maintainer="${MAINTAINER}" ENV APP_NAME=agent COPY --from=builder /usr/bin/${APP_NAME} /usr/bin/${APP_NAME} +# skipcq: DOK-DL3002 USER nonroot:nonroot ENTRYPOINT ["/usr/bin/agent"] diff --git a/dockers/agent/core/faiss/Dockerfile b/dockers/agent/core/faiss/Dockerfile index d9755d36c1..e38732bedc 100644 --- a/dockers/agent/core/faiss/Dockerfile +++ b/dockers/agent/core/faiss/Dockerfile @@ -18,11 +18,14 @@ # DO_NOT_EDIT this Dockerfile is generated by hack/docker/gen/main.go ARG UPX_OPTIONS=-9 -# skipcq: DOK-DL3026 +# skipcq: DOK-DL3026,DOK-DL3007 FROM ghcr.io/vdaas/vald/vald-buildbase:nightly AS builder ARG MAINTAINER="vdaas.org vald team " LABEL maintainer="${MAINTAINER}" +# skipcq: DOK-DL3002 +USER root:root + ARG TARGETARCH ARG TARGETOS ARG GO_VERSION @@ -35,14 +38,21 @@ ENV GOROOT=/opt/go ENV HOME=/root ENV INITRD=No ENV LANG=en_US.UTF-8 +ENV LANGUAGE=en_US.UTF-8 +ENV LC_ALL=en_US.UTF-8 ENV ORG=vdaas ENV PKG=agent/core/faiss ENV REPO=vald +ENV TZ=Etc/UTC +ENV USER=root ENV PATH=${GOPATH}/bin:${GOROOT}/bin:/usr/local/bin:${PATH} SHELL ["/bin/bash", "-o", "pipefail", "-c"] # skipcq: DOK-DL3008 -RUN apt-get clean \ +RUN rm -f /etc/apt/apt.conf.d/docker-clean \ + && echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache \ + && echo 'APT::Install-Recommends "false";' > /etc/apt/apt.conf.d/no-install-recommends \ + && apt-get clean \ && rm -rf \ /var/lib/apt/lists/* \ /var/cache/* \ @@ -53,20 +63,28 @@ RUN apt-get clean \ ca-certificates \ curl \ git \ + tzdata \ + locales \ cmake \ - g++ \ gcc \ + g++ \ unzip \ liblapack-dev \ libomp-dev \ libopenblas-dev \ gfortran \ && ldconfig \ + && echo "${LANG} UTF-8" > /etc/locale.gen \ + && ln -fs /usr/share/zoneinfo/${TZ} /etc/localtime \ + && locale-gen ${LANGUAGE} \ + && update-locale LANG=${LANGUAGE} \ + && dpkg-reconfigure -f noninteractive tzdata \ && apt-get clean \ + && apt-get autoclean -y \ && rm -rf \ /var/lib/apt/lists/* \ /var/cache/* \ - && apt-get autoremove + && apt-get autoremove -y WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} COPY Makefile . @@ -90,7 +108,7 @@ WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/cmd/${PKG} COPY cmd/${PKG} . WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} -#skipcq: DOK-W1001, DOK-SC2086 +#skipcq: DOK-W1001, DOK-SC2086, DOK-DL3008 RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ make GO_VERSION="${GO_VERSION}" go/install \ @@ -98,7 +116,7 @@ RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ && make faiss/install \ && make GOARCH="${TARGETARCH}" GOOS="${TARGETOS}" REPO="${ORG}" NAME="${REPO}" cmd/${PKG}/${APP_NAME} \ && mv "cmd/${PKG}/${APP_NAME}" "/usr/bin/${APP_NAME}" -# skipcq: DOK-DL3026 +# skipcq: DOK-DL3026,DOK-DL3007 FROM gcr.io/distroless/static:nonroot ARG MAINTAINER="vdaas.org vald team " LABEL maintainer="${MAINTAINER}" @@ -107,5 +125,6 @@ ENV APP_NAME=faiss COPY --from=builder /usr/bin/${APP_NAME} /usr/bin/${APP_NAME} COPY --from=builder /tmp/config.yaml /etc/server/config.yaml +# skipcq: DOK-DL3002 USER nonroot:nonroot ENTRYPOINT ["/usr/bin/faiss"] diff --git a/dockers/agent/core/ngt/Dockerfile b/dockers/agent/core/ngt/Dockerfile index f1ef1aa20e..742b5dbaf8 100644 --- a/dockers/agent/core/ngt/Dockerfile +++ b/dockers/agent/core/ngt/Dockerfile @@ -18,11 +18,14 @@ # DO_NOT_EDIT this Dockerfile is generated by hack/docker/gen/main.go ARG UPX_OPTIONS=-9 -# skipcq: DOK-DL3026 +# skipcq: DOK-DL3026,DOK-DL3007 FROM ghcr.io/vdaas/vald/vald-buildbase:nightly AS builder ARG MAINTAINER="vdaas.org vald team " LABEL maintainer="${MAINTAINER}" +# skipcq: DOK-DL3002 +USER root:root + ARG TARGETARCH ARG TARGETOS ARG GO_VERSION @@ -35,14 +38,21 @@ ENV GOROOT=/opt/go ENV HOME=/root ENV INITRD=No ENV LANG=en_US.UTF-8 +ENV LANGUAGE=en_US.UTF-8 +ENV LC_ALL=en_US.UTF-8 ENV ORG=vdaas ENV PKG=agent/core/ngt ENV REPO=vald +ENV TZ=Etc/UTC +ENV USER=root ENV PATH=${GOPATH}/bin:${GOROOT}/bin:/usr/local/bin:${PATH} SHELL ["/bin/bash", "-o", "pipefail", "-c"] # skipcq: DOK-DL3008 -RUN apt-get clean \ +RUN rm -f /etc/apt/apt.conf.d/docker-clean \ + && echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache \ + && echo 'APT::Install-Recommends "false";' > /etc/apt/apt.conf.d/no-install-recommends \ + && apt-get clean \ && rm -rf \ /var/lib/apt/lists/* \ /var/cache/* \ @@ -53,19 +63,27 @@ RUN apt-get clean \ ca-certificates \ curl \ git \ + tzdata \ + locales \ cmake \ - g++ \ gcc \ + g++ \ unzip \ liblapack-dev \ libomp-dev \ libopenblas-dev \ && ldconfig \ + && echo "${LANG} UTF-8" > /etc/locale.gen \ + && ln -fs /usr/share/zoneinfo/${TZ} /etc/localtime \ + && locale-gen ${LANGUAGE} \ + && update-locale LANG=${LANGUAGE} \ + && dpkg-reconfigure -f noninteractive tzdata \ && apt-get clean \ + && apt-get autoclean -y \ && rm -rf \ /var/lib/apt/lists/* \ /var/cache/* \ - && apt-get autoremove + && apt-get autoremove -y WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} COPY Makefile . @@ -89,7 +107,7 @@ WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/cmd/${PKG} COPY cmd/${PKG} . WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} -#skipcq: DOK-W1001, DOK-SC2086 +#skipcq: DOK-W1001, DOK-SC2086, DOK-DL3008 RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ make GO_VERSION="${GO_VERSION}" go/install \ @@ -97,7 +115,7 @@ RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ && make ngt/install \ && make GOARCH="${TARGETARCH}" GOOS="${TARGETOS}" REPO="${ORG}" NAME="${REPO}" cmd/${PKG}/${APP_NAME} \ && mv "cmd/${PKG}/${APP_NAME}" "/usr/bin/${APP_NAME}" -# skipcq: DOK-DL3026 +# skipcq: DOK-DL3026,DOK-DL3007 FROM gcr.io/distroless/static:nonroot ARG MAINTAINER="vdaas.org vald team " LABEL maintainer="${MAINTAINER}" @@ -106,5 +124,6 @@ ENV APP_NAME=ngt COPY --from=builder /usr/bin/${APP_NAME} /usr/bin/${APP_NAME} COPY --from=builder /tmp/config.yaml /etc/server/config.yaml +# skipcq: DOK-DL3002 USER nonroot:nonroot ENTRYPOINT ["/usr/bin/ngt"] diff --git a/dockers/agent/sidecar/Dockerfile b/dockers/agent/sidecar/Dockerfile index 21cdfea4d0..acae597610 100644 --- a/dockers/agent/sidecar/Dockerfile +++ b/dockers/agent/sidecar/Dockerfile @@ -18,11 +18,14 @@ # DO_NOT_EDIT this Dockerfile is generated by hack/docker/gen/main.go ARG UPX_OPTIONS=-9 -# skipcq: DOK-DL3026 +# skipcq: DOK-DL3026,DOK-DL3007 FROM ghcr.io/vdaas/vald/vald-buildbase:nightly AS builder ARG MAINTAINER="vdaas.org vald team " LABEL maintainer="${MAINTAINER}" +# skipcq: DOK-DL3002 +USER root:root + ARG TARGETARCH ARG TARGETOS ARG GO_VERSION @@ -35,14 +38,21 @@ ENV GOROOT=/opt/go ENV HOME=/root ENV INITRD=No ENV LANG=en_US.UTF-8 +ENV LANGUAGE=en_US.UTF-8 +ENV LC_ALL=en_US.UTF-8 ENV ORG=vdaas ENV PKG=agent/sidecar ENV REPO=vald +ENV TZ=Etc/UTC +ENV USER=root ENV PATH=${GOPATH}/bin:${GOROOT}/bin:/usr/local/bin:${PATH} SHELL ["/bin/bash", "-o", "pipefail", "-c"] # skipcq: DOK-DL3008 -RUN apt-get clean \ +RUN rm -f /etc/apt/apt.conf.d/docker-clean \ + && echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache \ + && echo 'APT::Install-Recommends "false";' > /etc/apt/apt.conf.d/no-install-recommends \ + && apt-get clean \ && rm -rf \ /var/lib/apt/lists/* \ /var/cache/* \ @@ -53,12 +63,20 @@ RUN apt-get clean \ ca-certificates \ curl \ git \ + tzdata \ + locales \ && ldconfig \ + && echo "${LANG} UTF-8" > /etc/locale.gen \ + && ln -fs /usr/share/zoneinfo/${TZ} /etc/localtime \ + && locale-gen ${LANGUAGE} \ + && update-locale LANG=${LANGUAGE} \ + && dpkg-reconfigure -f noninteractive tzdata \ && apt-get clean \ + && apt-get autoclean -y \ && rm -rf \ /var/lib/apt/lists/* \ /var/cache/* \ - && apt-get autoremove + && apt-get autoremove -y WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} COPY Makefile . @@ -81,14 +99,14 @@ WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/cmd/${PKG} COPY cmd/${PKG} . WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} -#skipcq: DOK-W1001, DOK-SC2086 +#skipcq: DOK-W1001, DOK-SC2086, DOK-DL3008 RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ make GO_VERSION="${GO_VERSION}" go/install \ && make go/download \ && make GOARCH="${TARGETARCH}" GOOS="${TARGETOS}" REPO="${ORG}" NAME="${REPO}" cmd/${PKG}/${APP_NAME} \ && mv "cmd/${PKG}/${APP_NAME}" "/usr/bin/${APP_NAME}" -# skipcq: DOK-DL3026 +# skipcq: DOK-DL3026,DOK-DL3007 FROM gcr.io/distroless/static:nonroot ARG MAINTAINER="vdaas.org vald team " LABEL maintainer="${MAINTAINER}" @@ -96,5 +114,6 @@ LABEL maintainer="${MAINTAINER}" ENV APP_NAME=sidecar COPY --from=builder /usr/bin/${APP_NAME} /usr/bin/${APP_NAME} +# skipcq: DOK-DL3002 USER nonroot:nonroot ENTRYPOINT ["/usr/bin/sidecar"] diff --git a/dockers/ci/base/Dockerfile b/dockers/ci/base/Dockerfile index f6e4aae0c6..3bf54cbfc8 100644 --- a/dockers/ci/base/Dockerfile +++ b/dockers/ci/base/Dockerfile @@ -18,11 +18,16 @@ # DO_NOT_EDIT this Dockerfile is generated by hack/docker/gen/main.go ARG UPX_OPTIONS=-9 -# skipcq: DOK-DL3026 -FROM ghcr.io/vdaas/vald/vald-buildbase:nightly +# skipcq: DOK-DL3026,DOK-DL3007 +FROM docker:rc-dind AS docker +# skipcq: DOK-DL3026,DOK-DL3007 +FROM ghcr.io/actions-runner-controller/actions-runner-controller/actions-runner-dind:latest ARG MAINTAINER="vdaas.org vald team " LABEL maintainer="${MAINTAINER}" +# skipcq: DOK-DL3002 +USER root:root + ARG TARGETARCH ARG TARGETOS ARG GO_VERSION @@ -35,17 +40,24 @@ ENV GOROOT=/opt/go ENV HOME=/root ENV INITRD=No ENV LANG=en_US.UTF-8 +ENV LANGUAGE=en_US.UTF-8 +ENV LC_ALL=en_US.UTF-8 ENV ORG=vdaas ENV PKG=ci/base ENV REPO=vald ENV RUST_HOME=/usr/loacl/lib/rust -ENV RUSTUP_HOME=${RUST_HOME}/rustup +ENV TZ=Etc/UTC +ENV USER=root ENV CARGO_HOME=${RUST_HOME}/cargo +ENV RUSTUP_HOME=${RUST_HOME}/rustup ENV PATH=${CARGO_HOME}/bin:${GOPATH}/bin:${GOROOT}/bin:${RUSTUP_HOME}/bin:/usr/local/bin:${PATH} SHELL ["/bin/bash", "-o", "pipefail", "-c"] # skipcq: DOK-DL3008 -RUN apt-get clean \ +RUN rm -f /etc/apt/apt.conf.d/docker-clean \ + && echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache \ + && echo 'APT::Install-Recommends "false";' > /etc/apt/apt.conf.d/no-install-recommends \ + && apt-get clean \ && rm -rf \ /var/lib/apt/lists/* \ /var/cache/* \ @@ -56,41 +68,54 @@ RUN apt-get clean \ ca-certificates \ curl \ git \ + tzdata \ + locales \ cmake \ - g++ \ gcc \ + g++ \ unzip \ liblapack-dev \ libomp-dev \ libopenblas-dev \ gfortran \ - curl \ gawk \ - git \ gnupg2 \ graphviz \ jq \ libhdf5-dev \ libaec-dev \ - nodejs \ - npm \ sed \ zip \ && ldconfig \ + && echo "${LANG} UTF-8" > /etc/locale.gen \ + && ln -fs /usr/share/zoneinfo/${TZ} /etc/localtime \ + && locale-gen ${LANGUAGE} \ + && update-locale LANG=${LANGUAGE} \ + && dpkg-reconfigure -f noninteractive tzdata \ && apt-get clean \ + && apt-get autoclean -y \ && rm -rf \ /var/lib/apt/lists/* \ /var/cache/* \ - && apt-get autoremove + && apt-get autoremove -y WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} COPY Makefile . COPY .git . WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} COPY . . +COPY --from=docker /usr/local/bin/dind /usr/bin/dind +COPY --from=docker /usr/local/bin/docker /usr/bin/docker +COPY --from=docker /usr/local/bin/docker-entrypoint.sh /usr/bin/docker-entrypoint.sh +COPY --from=docker /usr/local/bin/docker-init /usr/bin/docker-init +COPY --from=docker /usr/local/bin/docker-proxy /usr/bin/docker-proxy +COPY --from=docker /usr/local/bin/dockerd /usr/bin/dockerd +COPY --from=docker /usr/local/bin/dockerd-entrypoint.sh /usr/bin/dockerd-entrypoint.sh +COPY --from=docker /usr/local/bin/modprobe /usr/bin/modprobe +COPY --from=docker /usr/local/bin/runc /usr/bin/runc WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} -#skipcq: DOK-W1001, DOK-SC2086 +#skipcq: DOK-W1001, DOK-SC2086, DOK-DL3008 RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ make GO_VERSION="${GO_VERSION}" go/install \ @@ -100,9 +125,21 @@ RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ && sysctl -w net.ipv6.conf.default.disable_ipv6=1 \ && sysctl -w net.ipv6.conf.lo.disable_ipv6=1 \ && sysctl -p \ + && curl -fsSL https://deb.nodesource.com/setup_current.x | bash - \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* /var/cache/* \ + && apt-get update -y \ + && apt-get upgrade -y \ + && apt-get install -y --no-install-recommends --fix-missing nodejs libssl-dev \ + && npm install -g npm@latest \ + && apt-get clean \ + && apt-get autoclean -y \ + && rm -rf /var/lib/apt/lists/* /var/cache/* \ + && apt-get autoremove -y \ && make GOARCH=${TARGETARCH} GOOS=${TARGETOS} deps GO_CLEAN_DEPS=false \ && make GOARCH=${TARGETARCH} GOOS=${TARGETOS} golangci-lint/install \ && make GOARCH=${TARGETARCH} GOOS=${TARGETOS} gotestfmt/install \ + && make cmake/install \ && make buf/install \ && make hdf5/install \ && make helm-docs/install \ @@ -122,3 +159,6 @@ RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ && make ngt/install \ && make faiss/install \ && rm -rf ${GOPATH}/src/github.com/${ORG}/${REPO}/* +# skipcq: DOK-DL3002 +USER root:root +ENTRYPOINT ["/bin/bash", "-c", "/usr/bin/entrypoint-dind.sh"] diff --git a/dockers/dev/Dockerfile b/dockers/dev/Dockerfile index d7409e637e..9d85b71198 100644 --- a/dockers/dev/Dockerfile +++ b/dockers/dev/Dockerfile @@ -18,11 +18,14 @@ # DO_NOT_EDIT this Dockerfile is generated by hack/docker/gen/main.go ARG UPX_OPTIONS=-9 -# skipcq: DOK-DL3026 +# skipcq: DOK-DL3026,DOK-DL3007 FROM mcr.microsoft.com/vscode/devcontainers/base:debian ARG MAINTAINER="vdaas.org vald team " LABEL maintainer="${MAINTAINER}" +# skipcq: DOK-DL3002 +USER root:root + ARG TARGETARCH ARG TARGETOS ARG GO_VERSION @@ -35,17 +38,24 @@ ENV GOROOT=/opt/go ENV HOME=/root ENV INITRD=No ENV LANG=en_US.UTF-8 +ENV LANGUAGE=en_US.UTF-8 +ENV LC_ALL=en_US.UTF-8 ENV ORG=vdaas ENV PKG=dev 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 PATH=${CARGO_HOME}/bin:${GOPATH}/bin:${GOROOT}/bin:${RUSTUP_HOME}/bin:/usr/local/bin:${PATH} SHELL ["/bin/bash", "-o", "pipefail", "-c"] # skipcq: DOK-DL3008 -RUN apt-get clean \ +RUN rm -f /etc/apt/apt.conf.d/docker-clean \ + && echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache \ + && echo 'APT::Install-Recommends "false";' > /etc/apt/apt.conf.d/no-install-recommends \ + && apt-get clean \ && rm -rf \ /var/lib/apt/lists/* \ /var/cache/* \ @@ -56,32 +66,36 @@ RUN apt-get clean \ ca-certificates \ curl \ git \ + tzdata \ + locales \ cmake \ - g++ \ gcc \ + g++ \ unzip \ liblapack-dev \ libomp-dev \ libopenblas-dev \ gfortran \ - curl \ gawk \ - git \ gnupg2 \ graphviz \ jq \ libhdf5-dev \ libaec-dev \ - nodejs \ - npm \ sed \ zip \ && ldconfig \ + && echo "${LANG} UTF-8" > /etc/locale.gen \ + && ln -fs /usr/share/zoneinfo/${TZ} /etc/localtime \ + && locale-gen ${LANGUAGE} \ + && update-locale LANG=${LANGUAGE} \ + && dpkg-reconfigure -f noninteractive tzdata \ && apt-get clean \ + && apt-get autoclean -y \ && rm -rf \ /var/lib/apt/lists/* \ /var/cache/* \ - && apt-get autoremove + && apt-get autoremove -y WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} COPY Makefile . @@ -90,15 +104,27 @@ WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} COPY . . WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} -#skipcq: DOK-W1001, DOK-SC2086 +#skipcq: DOK-W1001, DOK-SC2086, DOK-DL3008 RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ make GO_VERSION="${GO_VERSION}" go/install \ && make go/download \ && make RUST_VERSION="${RUST_VERSION}" rust/install \ + && curl -fsSL https://deb.nodesource.com/setup_current.x | bash - \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* /var/cache/* \ + && apt-get update -y \ + && apt-get upgrade -y \ + && apt-get install -y --no-install-recommends --fix-missing nodejs libssl-dev \ + && npm install -g npm@latest \ + && apt-get clean \ + && apt-get autoclean -y \ + && rm -rf /var/lib/apt/lists/* /var/cache/* \ + && apt-get autoremove -y \ && make GOARCH=${TARGETARCH} GOOS=${TARGETOS} deps GO_CLEAN_DEPS=false \ && make GOARCH=${TARGETARCH} GOOS=${TARGETOS} golangci-lint/install \ && make GOARCH=${TARGETARCH} GOOS=${TARGETOS} gotestfmt/install \ + && make cmake/install \ && make buf/install \ && make hdf5/install \ && make helm-docs/install \ @@ -125,3 +151,5 @@ RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ && make ngt/install \ && make faiss/install \ && rm -rf ${GOPATH}/src/github.com/${ORG}/${REPO}/* +# skipcq: DOK-DL3002 +USER root:root diff --git a/dockers/discoverer/k8s/Dockerfile b/dockers/discoverer/k8s/Dockerfile index 28fd4770c7..476699b860 100644 --- a/dockers/discoverer/k8s/Dockerfile +++ b/dockers/discoverer/k8s/Dockerfile @@ -18,11 +18,14 @@ # DO_NOT_EDIT this Dockerfile is generated by hack/docker/gen/main.go ARG UPX_OPTIONS=-9 -# skipcq: DOK-DL3026 +# skipcq: DOK-DL3026,DOK-DL3007 FROM ghcr.io/vdaas/vald/vald-buildbase:nightly AS builder ARG MAINTAINER="vdaas.org vald team " LABEL maintainer="${MAINTAINER}" +# skipcq: DOK-DL3002 +USER root:root + ARG TARGETARCH ARG TARGETOS ARG GO_VERSION @@ -35,14 +38,21 @@ ENV GOROOT=/opt/go ENV HOME=/root ENV INITRD=No ENV LANG=en_US.UTF-8 +ENV LANGUAGE=en_US.UTF-8 +ENV LC_ALL=en_US.UTF-8 ENV ORG=vdaas ENV PKG=discoverer/k8s ENV REPO=vald +ENV TZ=Etc/UTC +ENV USER=root ENV PATH=${GOPATH}/bin:${GOROOT}/bin:/usr/local/bin:${PATH} SHELL ["/bin/bash", "-o", "pipefail", "-c"] # skipcq: DOK-DL3008 -RUN apt-get clean \ +RUN rm -f /etc/apt/apt.conf.d/docker-clean \ + && echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache \ + && echo 'APT::Install-Recommends "false";' > /etc/apt/apt.conf.d/no-install-recommends \ + && apt-get clean \ && rm -rf \ /var/lib/apt/lists/* \ /var/cache/* \ @@ -53,12 +63,20 @@ RUN apt-get clean \ ca-certificates \ curl \ git \ + tzdata \ + locales \ && ldconfig \ + && echo "${LANG} UTF-8" > /etc/locale.gen \ + && ln -fs /usr/share/zoneinfo/${TZ} /etc/localtime \ + && locale-gen ${LANGUAGE} \ + && update-locale LANG=${LANGUAGE} \ + && dpkg-reconfigure -f noninteractive tzdata \ && apt-get clean \ + && apt-get autoclean -y \ && rm -rf \ /var/lib/apt/lists/* \ /var/cache/* \ - && apt-get autoremove + && apt-get autoremove -y WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} COPY Makefile . @@ -80,14 +98,14 @@ WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/cmd/${PKG} COPY cmd/${PKG} . WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} -#skipcq: DOK-W1001, DOK-SC2086 +#skipcq: DOK-W1001, DOK-SC2086, DOK-DL3008 RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ make GO_VERSION="${GO_VERSION}" go/install \ && make go/download \ && make GOARCH="${TARGETARCH}" GOOS="${TARGETOS}" REPO="${ORG}" NAME="${REPO}" cmd/${PKG}/${APP_NAME} \ && mv "cmd/${PKG}/${APP_NAME}" "/usr/bin/${APP_NAME}" -# skipcq: DOK-DL3026 +# skipcq: DOK-DL3026,DOK-DL3007 FROM gcr.io/distroless/static:nonroot ARG MAINTAINER="vdaas.org vald team " LABEL maintainer="${MAINTAINER}" @@ -96,5 +114,6 @@ ENV APP_NAME=discoverer COPY --from=builder /usr/bin/${APP_NAME} /usr/bin/${APP_NAME} COPY --from=builder /tmp/config.yaml /etc/server/config.yaml +# skipcq: DOK-DL3002 USER nonroot:nonroot ENTRYPOINT ["/usr/bin/discoverer"] diff --git a/dockers/gateway/filter/Dockerfile b/dockers/gateway/filter/Dockerfile index b2f5478a5c..fcbb592ec9 100644 --- a/dockers/gateway/filter/Dockerfile +++ b/dockers/gateway/filter/Dockerfile @@ -18,11 +18,14 @@ # DO_NOT_EDIT this Dockerfile is generated by hack/docker/gen/main.go ARG UPX_OPTIONS=-9 -# skipcq: DOK-DL3026 +# skipcq: DOK-DL3026,DOK-DL3007 FROM ghcr.io/vdaas/vald/vald-buildbase:nightly AS builder ARG MAINTAINER="vdaas.org vald team " LABEL maintainer="${MAINTAINER}" +# skipcq: DOK-DL3002 +USER root:root + ARG TARGETARCH ARG TARGETOS ARG GO_VERSION @@ -35,14 +38,21 @@ ENV GOROOT=/opt/go ENV HOME=/root ENV INITRD=No ENV LANG=en_US.UTF-8 +ENV LANGUAGE=en_US.UTF-8 +ENV LC_ALL=en_US.UTF-8 ENV ORG=vdaas ENV PKG=gateway/filter ENV REPO=vald +ENV TZ=Etc/UTC +ENV USER=root ENV PATH=${GOPATH}/bin:${GOROOT}/bin:/usr/local/bin:${PATH} SHELL ["/bin/bash", "-o", "pipefail", "-c"] # skipcq: DOK-DL3008 -RUN apt-get clean \ +RUN rm -f /etc/apt/apt.conf.d/docker-clean \ + && echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache \ + && echo 'APT::Install-Recommends "false";' > /etc/apt/apt.conf.d/no-install-recommends \ + && apt-get clean \ && rm -rf \ /var/lib/apt/lists/* \ /var/cache/* \ @@ -53,12 +63,20 @@ RUN apt-get clean \ ca-certificates \ curl \ git \ + tzdata \ + locales \ && ldconfig \ + && echo "${LANG} UTF-8" > /etc/locale.gen \ + && ln -fs /usr/share/zoneinfo/${TZ} /etc/localtime \ + && locale-gen ${LANGUAGE} \ + && update-locale LANG=${LANGUAGE} \ + && dpkg-reconfigure -f noninteractive tzdata \ && apt-get clean \ + && apt-get autoclean -y \ && rm -rf \ /var/lib/apt/lists/* \ /var/cache/* \ - && apt-get autoremove + && apt-get autoremove -y WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} COPY Makefile . @@ -80,14 +98,14 @@ WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/cmd/${PKG} COPY cmd/${PKG} . WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} -#skipcq: DOK-W1001, DOK-SC2086 +#skipcq: DOK-W1001, DOK-SC2086, DOK-DL3008 RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ make GO_VERSION="${GO_VERSION}" go/install \ && make go/download \ && make GOARCH="${TARGETARCH}" GOOS="${TARGETOS}" REPO="${ORG}" NAME="${REPO}" cmd/${PKG}/${APP_NAME} \ && mv "cmd/${PKG}/${APP_NAME}" "/usr/bin/${APP_NAME}" -# skipcq: DOK-DL3026 +# skipcq: DOK-DL3026,DOK-DL3007 FROM gcr.io/distroless/static:nonroot ARG MAINTAINER="vdaas.org vald team " LABEL maintainer="${MAINTAINER}" @@ -96,5 +114,6 @@ ENV APP_NAME=filter COPY --from=builder /usr/bin/${APP_NAME} /usr/bin/${APP_NAME} COPY --from=builder /tmp/config.yaml /etc/server/config.yaml +# skipcq: DOK-DL3002 USER nonroot:nonroot ENTRYPOINT ["/usr/bin/filter"] diff --git a/dockers/gateway/lb/Dockerfile b/dockers/gateway/lb/Dockerfile index bf78cc7ad8..8a5dcf7495 100644 --- a/dockers/gateway/lb/Dockerfile +++ b/dockers/gateway/lb/Dockerfile @@ -18,11 +18,14 @@ # DO_NOT_EDIT this Dockerfile is generated by hack/docker/gen/main.go ARG UPX_OPTIONS=-9 -# skipcq: DOK-DL3026 +# skipcq: DOK-DL3026,DOK-DL3007 FROM ghcr.io/vdaas/vald/vald-buildbase:nightly AS builder ARG MAINTAINER="vdaas.org vald team " LABEL maintainer="${MAINTAINER}" +# skipcq: DOK-DL3002 +USER root:root + ARG TARGETARCH ARG TARGETOS ARG GO_VERSION @@ -35,14 +38,21 @@ ENV GOROOT=/opt/go ENV HOME=/root ENV INITRD=No ENV LANG=en_US.UTF-8 +ENV LANGUAGE=en_US.UTF-8 +ENV LC_ALL=en_US.UTF-8 ENV ORG=vdaas ENV PKG=gateway/lb ENV REPO=vald +ENV TZ=Etc/UTC +ENV USER=root ENV PATH=${GOPATH}/bin:${GOROOT}/bin:/usr/local/bin:${PATH} SHELL ["/bin/bash", "-o", "pipefail", "-c"] # skipcq: DOK-DL3008 -RUN apt-get clean \ +RUN rm -f /etc/apt/apt.conf.d/docker-clean \ + && echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache \ + && echo 'APT::Install-Recommends "false";' > /etc/apt/apt.conf.d/no-install-recommends \ + && apt-get clean \ && rm -rf \ /var/lib/apt/lists/* \ /var/cache/* \ @@ -53,12 +63,20 @@ RUN apt-get clean \ ca-certificates \ curl \ git \ + tzdata \ + locales \ && ldconfig \ + && echo "${LANG} UTF-8" > /etc/locale.gen \ + && ln -fs /usr/share/zoneinfo/${TZ} /etc/localtime \ + && locale-gen ${LANGUAGE} \ + && update-locale LANG=${LANGUAGE} \ + && dpkg-reconfigure -f noninteractive tzdata \ && apt-get clean \ + && apt-get autoclean -y \ && rm -rf \ /var/lib/apt/lists/* \ /var/cache/* \ - && apt-get autoremove + && apt-get autoremove -y WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} COPY Makefile . @@ -80,14 +98,14 @@ WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/cmd/${PKG} COPY cmd/${PKG} . WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} -#skipcq: DOK-W1001, DOK-SC2086 +#skipcq: DOK-W1001, DOK-SC2086, DOK-DL3008 RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ make GO_VERSION="${GO_VERSION}" go/install \ && make go/download \ && make GOARCH="${TARGETARCH}" GOOS="${TARGETOS}" REPO="${ORG}" NAME="${REPO}" cmd/${PKG}/${APP_NAME} \ && mv "cmd/${PKG}/${APP_NAME}" "/usr/bin/${APP_NAME}" -# skipcq: DOK-DL3026 +# skipcq: DOK-DL3026,DOK-DL3007 FROM gcr.io/distroless/static:nonroot ARG MAINTAINER="vdaas.org vald team " LABEL maintainer="${MAINTAINER}" @@ -96,5 +114,6 @@ ENV APP_NAME=lb COPY --from=builder /usr/bin/${APP_NAME} /usr/bin/${APP_NAME} COPY --from=builder /tmp/config.yaml /etc/server/config.yaml +# skipcq: DOK-DL3002 USER nonroot:nonroot ENTRYPOINT ["/usr/bin/lb"] diff --git a/dockers/gateway/mirror/Dockerfile b/dockers/gateway/mirror/Dockerfile index c52c633a04..43986ebecc 100644 --- a/dockers/gateway/mirror/Dockerfile +++ b/dockers/gateway/mirror/Dockerfile @@ -18,11 +18,14 @@ # DO_NOT_EDIT this Dockerfile is generated by hack/docker/gen/main.go ARG UPX_OPTIONS=-9 -# skipcq: DOK-DL3026 +# skipcq: DOK-DL3026,DOK-DL3007 FROM ghcr.io/vdaas/vald/vald-buildbase:nightly AS builder ARG MAINTAINER="vdaas.org vald team " LABEL maintainer="${MAINTAINER}" +# skipcq: DOK-DL3002 +USER root:root + ARG TARGETARCH ARG TARGETOS ARG GO_VERSION @@ -35,14 +38,21 @@ ENV GOROOT=/opt/go ENV HOME=/root ENV INITRD=No ENV LANG=en_US.UTF-8 +ENV LANGUAGE=en_US.UTF-8 +ENV LC_ALL=en_US.UTF-8 ENV ORG=vdaas ENV PKG=gateway/mirror ENV REPO=vald +ENV TZ=Etc/UTC +ENV USER=root ENV PATH=${GOPATH}/bin:${GOROOT}/bin:/usr/local/bin:${PATH} SHELL ["/bin/bash", "-o", "pipefail", "-c"] # skipcq: DOK-DL3008 -RUN apt-get clean \ +RUN rm -f /etc/apt/apt.conf.d/docker-clean \ + && echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache \ + && echo 'APT::Install-Recommends "false";' > /etc/apt/apt.conf.d/no-install-recommends \ + && apt-get clean \ && rm -rf \ /var/lib/apt/lists/* \ /var/cache/* \ @@ -53,12 +63,20 @@ RUN apt-get clean \ ca-certificates \ curl \ git \ + tzdata \ + locales \ && ldconfig \ + && echo "${LANG} UTF-8" > /etc/locale.gen \ + && ln -fs /usr/share/zoneinfo/${TZ} /etc/localtime \ + && locale-gen ${LANGUAGE} \ + && update-locale LANG=${LANGUAGE} \ + && dpkg-reconfigure -f noninteractive tzdata \ && apt-get clean \ + && apt-get autoclean -y \ && rm -rf \ /var/lib/apt/lists/* \ /var/cache/* \ - && apt-get autoremove + && apt-get autoremove -y WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} COPY Makefile . @@ -80,14 +98,14 @@ WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/cmd/${PKG} COPY cmd/${PKG} . WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} -#skipcq: DOK-W1001, DOK-SC2086 +#skipcq: DOK-W1001, DOK-SC2086, DOK-DL3008 RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ make GO_VERSION="${GO_VERSION}" go/install \ && make go/download \ && make GOARCH="${TARGETARCH}" GOOS="${TARGETOS}" REPO="${ORG}" NAME="${REPO}" cmd/${PKG}/${APP_NAME} \ && mv "cmd/${PKG}/${APP_NAME}" "/usr/bin/${APP_NAME}" -# skipcq: DOK-DL3026 +# skipcq: DOK-DL3026,DOK-DL3007 FROM gcr.io/distroless/static:nonroot ARG MAINTAINER="vdaas.org vald team " LABEL maintainer="${MAINTAINER}" @@ -96,5 +114,6 @@ ENV APP_NAME=mirror COPY --from=builder /usr/bin/${APP_NAME} /usr/bin/${APP_NAME} COPY --from=builder /tmp/config.yaml /etc/server/config.yaml +# skipcq: DOK-DL3002 USER nonroot:nonroot ENTRYPOINT ["/usr/bin/mirror"] diff --git a/dockers/index/job/correction/Dockerfile b/dockers/index/job/correction/Dockerfile index 269648c226..ac979ffd31 100644 --- a/dockers/index/job/correction/Dockerfile +++ b/dockers/index/job/correction/Dockerfile @@ -18,11 +18,14 @@ # DO_NOT_EDIT this Dockerfile is generated by hack/docker/gen/main.go ARG UPX_OPTIONS=-9 -# skipcq: DOK-DL3026 +# skipcq: DOK-DL3026,DOK-DL3007 FROM ghcr.io/vdaas/vald/vald-buildbase:nightly AS builder ARG MAINTAINER="vdaas.org vald team " LABEL maintainer="${MAINTAINER}" +# skipcq: DOK-DL3002 +USER root:root + ARG TARGETARCH ARG TARGETOS ARG GO_VERSION @@ -35,14 +38,21 @@ ENV GOROOT=/opt/go ENV HOME=/root ENV INITRD=No ENV LANG=en_US.UTF-8 +ENV LANGUAGE=en_US.UTF-8 +ENV LC_ALL=en_US.UTF-8 ENV ORG=vdaas ENV PKG=index/job/correction ENV REPO=vald +ENV TZ=Etc/UTC +ENV USER=root ENV PATH=${GOPATH}/bin:${GOROOT}/bin:/usr/local/bin:${PATH} SHELL ["/bin/bash", "-o", "pipefail", "-c"] # skipcq: DOK-DL3008 -RUN apt-get clean \ +RUN rm -f /etc/apt/apt.conf.d/docker-clean \ + && echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache \ + && echo 'APT::Install-Recommends "false";' > /etc/apt/apt.conf.d/no-install-recommends \ + && apt-get clean \ && rm -rf \ /var/lib/apt/lists/* \ /var/cache/* \ @@ -53,12 +63,20 @@ RUN apt-get clean \ ca-certificates \ curl \ git \ + tzdata \ + locales \ && ldconfig \ + && echo "${LANG} UTF-8" > /etc/locale.gen \ + && ln -fs /usr/share/zoneinfo/${TZ} /etc/localtime \ + && locale-gen ${LANGUAGE} \ + && update-locale LANG=${LANGUAGE} \ + && dpkg-reconfigure -f noninteractive tzdata \ && apt-get clean \ + && apt-get autoclean -y \ && rm -rf \ /var/lib/apt/lists/* \ /var/cache/* \ - && apt-get autoremove + && apt-get autoremove -y WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} COPY Makefile . @@ -80,14 +98,14 @@ WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/cmd/${PKG} COPY cmd/${PKG} . WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} -#skipcq: DOK-W1001, DOK-SC2086 +#skipcq: DOK-W1001, DOK-SC2086, DOK-DL3008 RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ make GO_VERSION="${GO_VERSION}" go/install \ && make go/download \ && make GOARCH="${TARGETARCH}" GOOS="${TARGETOS}" REPO="${ORG}" NAME="${REPO}" cmd/${PKG}/${APP_NAME} \ && mv "cmd/${PKG}/${APP_NAME}" "/usr/bin/${APP_NAME}" -# skipcq: DOK-DL3026 +# skipcq: DOK-DL3026,DOK-DL3007 FROM gcr.io/distroless/static:nonroot ARG MAINTAINER="vdaas.org vald team " LABEL maintainer="${MAINTAINER}" @@ -96,5 +114,6 @@ ENV APP_NAME=index-correction COPY --from=builder /usr/bin/${APP_NAME} /usr/bin/${APP_NAME} COPY --from=builder /tmp/config.yaml /etc/server/config.yaml +# skipcq: DOK-DL3002 USER nonroot:nonroot ENTRYPOINT ["/usr/bin/index-correction"] diff --git a/dockers/index/job/creation/Dockerfile b/dockers/index/job/creation/Dockerfile index 6af94e2436..041cbb9b8b 100644 --- a/dockers/index/job/creation/Dockerfile +++ b/dockers/index/job/creation/Dockerfile @@ -18,11 +18,14 @@ # DO_NOT_EDIT this Dockerfile is generated by hack/docker/gen/main.go ARG UPX_OPTIONS=-9 -# skipcq: DOK-DL3026 +# skipcq: DOK-DL3026,DOK-DL3007 FROM ghcr.io/vdaas/vald/vald-buildbase:nightly AS builder ARG MAINTAINER="vdaas.org vald team " LABEL maintainer="${MAINTAINER}" +# skipcq: DOK-DL3002 +USER root:root + ARG TARGETARCH ARG TARGETOS ARG GO_VERSION @@ -35,14 +38,21 @@ ENV GOROOT=/opt/go ENV HOME=/root ENV INITRD=No ENV LANG=en_US.UTF-8 +ENV LANGUAGE=en_US.UTF-8 +ENV LC_ALL=en_US.UTF-8 ENV ORG=vdaas ENV PKG=index/job/creation ENV REPO=vald +ENV TZ=Etc/UTC +ENV USER=root ENV PATH=${GOPATH}/bin:${GOROOT}/bin:/usr/local/bin:${PATH} SHELL ["/bin/bash", "-o", "pipefail", "-c"] # skipcq: DOK-DL3008 -RUN apt-get clean \ +RUN rm -f /etc/apt/apt.conf.d/docker-clean \ + && echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache \ + && echo 'APT::Install-Recommends "false";' > /etc/apt/apt.conf.d/no-install-recommends \ + && apt-get clean \ && rm -rf \ /var/lib/apt/lists/* \ /var/cache/* \ @@ -53,12 +63,20 @@ RUN apt-get clean \ ca-certificates \ curl \ git \ + tzdata \ + locales \ && ldconfig \ + && echo "${LANG} UTF-8" > /etc/locale.gen \ + && ln -fs /usr/share/zoneinfo/${TZ} /etc/localtime \ + && locale-gen ${LANGUAGE} \ + && update-locale LANG=${LANGUAGE} \ + && dpkg-reconfigure -f noninteractive tzdata \ && apt-get clean \ + && apt-get autoclean -y \ && rm -rf \ /var/lib/apt/lists/* \ /var/cache/* \ - && apt-get autoremove + && apt-get autoremove -y WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} COPY Makefile . @@ -80,14 +98,14 @@ WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/cmd/${PKG} COPY cmd/${PKG} . WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} -#skipcq: DOK-W1001, DOK-SC2086 +#skipcq: DOK-W1001, DOK-SC2086, DOK-DL3008 RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ make GO_VERSION="${GO_VERSION}" go/install \ && make go/download \ && make GOARCH="${TARGETARCH}" GOOS="${TARGETOS}" REPO="${ORG}" NAME="${REPO}" cmd/${PKG}/${APP_NAME} \ && mv "cmd/${PKG}/${APP_NAME}" "/usr/bin/${APP_NAME}" -# skipcq: DOK-DL3026 +# skipcq: DOK-DL3026,DOK-DL3007 FROM gcr.io/distroless/static:nonroot ARG MAINTAINER="vdaas.org vald team " LABEL maintainer="${MAINTAINER}" @@ -96,5 +114,6 @@ ENV APP_NAME=index-creation COPY --from=builder /usr/bin/${APP_NAME} /usr/bin/${APP_NAME} COPY --from=builder /tmp/config.yaml /etc/server/config.yaml +# skipcq: DOK-DL3002 USER nonroot:nonroot ENTRYPOINT ["/usr/bin/index-creation"] diff --git a/dockers/index/job/readreplica/rotate/Dockerfile b/dockers/index/job/readreplica/rotate/Dockerfile index 4fac5a23a2..bbde549c93 100644 --- a/dockers/index/job/readreplica/rotate/Dockerfile +++ b/dockers/index/job/readreplica/rotate/Dockerfile @@ -18,11 +18,14 @@ # DO_NOT_EDIT this Dockerfile is generated by hack/docker/gen/main.go ARG UPX_OPTIONS=-9 -# skipcq: DOK-DL3026 +# skipcq: DOK-DL3026,DOK-DL3007 FROM ghcr.io/vdaas/vald/vald-buildbase:nightly AS builder ARG MAINTAINER="vdaas.org vald team " LABEL maintainer="${MAINTAINER}" +# skipcq: DOK-DL3002 +USER root:root + ARG TARGETARCH ARG TARGETOS ARG GO_VERSION @@ -35,14 +38,21 @@ ENV GOROOT=/opt/go ENV HOME=/root ENV INITRD=No ENV LANG=en_US.UTF-8 +ENV LANGUAGE=en_US.UTF-8 +ENV LC_ALL=en_US.UTF-8 ENV ORG=vdaas ENV PKG=index/job/readreplica/rotate ENV REPO=vald +ENV TZ=Etc/UTC +ENV USER=root ENV PATH=${GOPATH}/bin:${GOROOT}/bin:/usr/local/bin:${PATH} SHELL ["/bin/bash", "-o", "pipefail", "-c"] # skipcq: DOK-DL3008 -RUN apt-get clean \ +RUN rm -f /etc/apt/apt.conf.d/docker-clean \ + && echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache \ + && echo 'APT::Install-Recommends "false";' > /etc/apt/apt.conf.d/no-install-recommends \ + && apt-get clean \ && rm -rf \ /var/lib/apt/lists/* \ /var/cache/* \ @@ -53,12 +63,20 @@ RUN apt-get clean \ ca-certificates \ curl \ git \ + tzdata \ + locales \ && ldconfig \ + && echo "${LANG} UTF-8" > /etc/locale.gen \ + && ln -fs /usr/share/zoneinfo/${TZ} /etc/localtime \ + && locale-gen ${LANGUAGE} \ + && update-locale LANG=${LANGUAGE} \ + && dpkg-reconfigure -f noninteractive tzdata \ && apt-get clean \ + && apt-get autoclean -y \ && rm -rf \ /var/lib/apt/lists/* \ /var/cache/* \ - && apt-get autoremove + && apt-get autoremove -y WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} COPY Makefile . @@ -80,14 +98,14 @@ WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/cmd/${PKG} COPY cmd/${PKG} . WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} -#skipcq: DOK-W1001, DOK-SC2086 +#skipcq: DOK-W1001, DOK-SC2086, DOK-DL3008 RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ make GO_VERSION="${GO_VERSION}" go/install \ && make go/download \ && make GOARCH="${TARGETARCH}" GOOS="${TARGETOS}" REPO="${ORG}" NAME="${REPO}" cmd/${PKG}/${APP_NAME} \ && mv "cmd/${PKG}/${APP_NAME}" "/usr/bin/${APP_NAME}" -# skipcq: DOK-DL3026 +# skipcq: DOK-DL3026,DOK-DL3007 FROM gcr.io/distroless/static:nonroot ARG MAINTAINER="vdaas.org vald team " LABEL maintainer="${MAINTAINER}" @@ -96,5 +114,6 @@ ENV APP_NAME=readreplica-rotate COPY --from=builder /usr/bin/${APP_NAME} /usr/bin/${APP_NAME} COPY --from=builder /tmp/config.yaml /etc/server/config.yaml +# skipcq: DOK-DL3002 USER nonroot:nonroot ENTRYPOINT ["/usr/bin/readreplica-rotate"] diff --git a/dockers/index/job/save/Dockerfile b/dockers/index/job/save/Dockerfile index 2af2997b22..1033d7aca3 100644 --- a/dockers/index/job/save/Dockerfile +++ b/dockers/index/job/save/Dockerfile @@ -18,11 +18,14 @@ # DO_NOT_EDIT this Dockerfile is generated by hack/docker/gen/main.go ARG UPX_OPTIONS=-9 -# skipcq: DOK-DL3026 +# skipcq: DOK-DL3026,DOK-DL3007 FROM ghcr.io/vdaas/vald/vald-buildbase:nightly AS builder ARG MAINTAINER="vdaas.org vald team " LABEL maintainer="${MAINTAINER}" +# skipcq: DOK-DL3002 +USER root:root + ARG TARGETARCH ARG TARGETOS ARG GO_VERSION @@ -35,14 +38,21 @@ ENV GOROOT=/opt/go ENV HOME=/root ENV INITRD=No ENV LANG=en_US.UTF-8 +ENV LANGUAGE=en_US.UTF-8 +ENV LC_ALL=en_US.UTF-8 ENV ORG=vdaas ENV PKG=index/job/save ENV REPO=vald +ENV TZ=Etc/UTC +ENV USER=root ENV PATH=${GOPATH}/bin:${GOROOT}/bin:/usr/local/bin:${PATH} SHELL ["/bin/bash", "-o", "pipefail", "-c"] # skipcq: DOK-DL3008 -RUN apt-get clean \ +RUN rm -f /etc/apt/apt.conf.d/docker-clean \ + && echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache \ + && echo 'APT::Install-Recommends "false";' > /etc/apt/apt.conf.d/no-install-recommends \ + && apt-get clean \ && rm -rf \ /var/lib/apt/lists/* \ /var/cache/* \ @@ -53,12 +63,20 @@ RUN apt-get clean \ ca-certificates \ curl \ git \ + tzdata \ + locales \ && ldconfig \ + && echo "${LANG} UTF-8" > /etc/locale.gen \ + && ln -fs /usr/share/zoneinfo/${TZ} /etc/localtime \ + && locale-gen ${LANGUAGE} \ + && update-locale LANG=${LANGUAGE} \ + && dpkg-reconfigure -f noninteractive tzdata \ && apt-get clean \ + && apt-get autoclean -y \ && rm -rf \ /var/lib/apt/lists/* \ /var/cache/* \ - && apt-get autoremove + && apt-get autoremove -y WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} COPY Makefile . @@ -80,14 +98,14 @@ WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/cmd/${PKG} COPY cmd/${PKG} . WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} -#skipcq: DOK-W1001, DOK-SC2086 +#skipcq: DOK-W1001, DOK-SC2086, DOK-DL3008 RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ make GO_VERSION="${GO_VERSION}" go/install \ && make go/download \ && make GOARCH="${TARGETARCH}" GOOS="${TARGETOS}" REPO="${ORG}" NAME="${REPO}" cmd/${PKG}/${APP_NAME} \ && mv "cmd/${PKG}/${APP_NAME}" "/usr/bin/${APP_NAME}" -# skipcq: DOK-DL3026 +# skipcq: DOK-DL3026,DOK-DL3007 FROM gcr.io/distroless/static:nonroot ARG MAINTAINER="vdaas.org vald team " LABEL maintainer="${MAINTAINER}" @@ -96,5 +114,6 @@ ENV APP_NAME=index-save COPY --from=builder /usr/bin/${APP_NAME} /usr/bin/${APP_NAME} COPY --from=builder /tmp/config.yaml /etc/server/config.yaml +# skipcq: DOK-DL3002 USER nonroot:nonroot ENTRYPOINT ["/usr/bin/index-save"] diff --git a/dockers/index/operator/Dockerfile b/dockers/index/operator/Dockerfile index ab6931a089..79671325fd 100644 --- a/dockers/index/operator/Dockerfile +++ b/dockers/index/operator/Dockerfile @@ -18,11 +18,14 @@ # DO_NOT_EDIT this Dockerfile is generated by hack/docker/gen/main.go ARG UPX_OPTIONS=-9 -# skipcq: DOK-DL3026 +# skipcq: DOK-DL3026,DOK-DL3007 FROM ghcr.io/vdaas/vald/vald-buildbase:nightly AS builder ARG MAINTAINER="vdaas.org vald team " LABEL maintainer="${MAINTAINER}" +# skipcq: DOK-DL3002 +USER root:root + ARG TARGETARCH ARG TARGETOS ARG GO_VERSION @@ -35,14 +38,21 @@ ENV GOROOT=/opt/go ENV HOME=/root ENV INITRD=No ENV LANG=en_US.UTF-8 +ENV LANGUAGE=en_US.UTF-8 +ENV LC_ALL=en_US.UTF-8 ENV ORG=vdaas ENV PKG=index/operator ENV REPO=vald +ENV TZ=Etc/UTC +ENV USER=root ENV PATH=${GOPATH}/bin:${GOROOT}/bin:/usr/local/bin:${PATH} SHELL ["/bin/bash", "-o", "pipefail", "-c"] # skipcq: DOK-DL3008 -RUN apt-get clean \ +RUN rm -f /etc/apt/apt.conf.d/docker-clean \ + && echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache \ + && echo 'APT::Install-Recommends "false";' > /etc/apt/apt.conf.d/no-install-recommends \ + && apt-get clean \ && rm -rf \ /var/lib/apt/lists/* \ /var/cache/* \ @@ -53,12 +63,20 @@ RUN apt-get clean \ ca-certificates \ curl \ git \ + tzdata \ + locales \ && ldconfig \ + && echo "${LANG} UTF-8" > /etc/locale.gen \ + && ln -fs /usr/share/zoneinfo/${TZ} /etc/localtime \ + && locale-gen ${LANGUAGE} \ + && update-locale LANG=${LANGUAGE} \ + && dpkg-reconfigure -f noninteractive tzdata \ && apt-get clean \ + && apt-get autoclean -y \ && rm -rf \ /var/lib/apt/lists/* \ /var/cache/* \ - && apt-get autoremove + && apt-get autoremove -y WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} COPY Makefile . @@ -80,14 +98,14 @@ WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/cmd/${PKG} COPY cmd/${PKG} . WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} -#skipcq: DOK-W1001, DOK-SC2086 +#skipcq: DOK-W1001, DOK-SC2086, DOK-DL3008 RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ make GO_VERSION="${GO_VERSION}" go/install \ && make go/download \ && make GOARCH="${TARGETARCH}" GOOS="${TARGETOS}" REPO="${ORG}" NAME="${REPO}" cmd/${PKG}/${APP_NAME} \ && mv "cmd/${PKG}/${APP_NAME}" "/usr/bin/${APP_NAME}" -# skipcq: DOK-DL3026 +# skipcq: DOK-DL3026,DOK-DL3007 FROM gcr.io/distroless/static:nonroot ARG MAINTAINER="vdaas.org vald team " LABEL maintainer="${MAINTAINER}" @@ -96,5 +114,6 @@ ENV APP_NAME=index-operator COPY --from=builder /usr/bin/${APP_NAME} /usr/bin/${APP_NAME} COPY --from=builder /tmp/config.yaml /etc/server/config.yaml +# skipcq: DOK-DL3002 USER nonroot:nonroot ENTRYPOINT ["/usr/bin/index-operator"] diff --git a/dockers/manager/index/Dockerfile b/dockers/manager/index/Dockerfile index 0475251f4c..a0b9da9629 100644 --- a/dockers/manager/index/Dockerfile +++ b/dockers/manager/index/Dockerfile @@ -18,11 +18,14 @@ # DO_NOT_EDIT this Dockerfile is generated by hack/docker/gen/main.go ARG UPX_OPTIONS=-9 -# skipcq: DOK-DL3026 +# skipcq: DOK-DL3026,DOK-DL3007 FROM ghcr.io/vdaas/vald/vald-buildbase:nightly AS builder ARG MAINTAINER="vdaas.org vald team " LABEL maintainer="${MAINTAINER}" +# skipcq: DOK-DL3002 +USER root:root + ARG TARGETARCH ARG TARGETOS ARG GO_VERSION @@ -35,14 +38,21 @@ ENV GOROOT=/opt/go ENV HOME=/root ENV INITRD=No ENV LANG=en_US.UTF-8 +ENV LANGUAGE=en_US.UTF-8 +ENV LC_ALL=en_US.UTF-8 ENV ORG=vdaas ENV PKG=manager/index ENV REPO=vald +ENV TZ=Etc/UTC +ENV USER=root ENV PATH=${GOPATH}/bin:${GOROOT}/bin:/usr/local/bin:${PATH} SHELL ["/bin/bash", "-o", "pipefail", "-c"] # skipcq: DOK-DL3008 -RUN apt-get clean \ +RUN rm -f /etc/apt/apt.conf.d/docker-clean \ + && echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache \ + && echo 'APT::Install-Recommends "false";' > /etc/apt/apt.conf.d/no-install-recommends \ + && apt-get clean \ && rm -rf \ /var/lib/apt/lists/* \ /var/cache/* \ @@ -53,12 +63,20 @@ RUN apt-get clean \ ca-certificates \ curl \ git \ + tzdata \ + locales \ && ldconfig \ + && echo "${LANG} UTF-8" > /etc/locale.gen \ + && ln -fs /usr/share/zoneinfo/${TZ} /etc/localtime \ + && locale-gen ${LANGUAGE} \ + && update-locale LANG=${LANGUAGE} \ + && dpkg-reconfigure -f noninteractive tzdata \ && apt-get clean \ + && apt-get autoclean -y \ && rm -rf \ /var/lib/apt/lists/* \ /var/cache/* \ - && apt-get autoremove + && apt-get autoremove -y WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} COPY Makefile . @@ -80,14 +98,14 @@ WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/cmd/${PKG} COPY cmd/${PKG} . WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} -#skipcq: DOK-W1001, DOK-SC2086 +#skipcq: DOK-W1001, DOK-SC2086, DOK-DL3008 RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ make GO_VERSION="${GO_VERSION}" go/install \ && make go/download \ && make GOARCH="${TARGETARCH}" GOOS="${TARGETOS}" REPO="${ORG}" NAME="${REPO}" cmd/${PKG}/${APP_NAME} \ && mv "cmd/${PKG}/${APP_NAME}" "/usr/bin/${APP_NAME}" -# skipcq: DOK-DL3026 +# skipcq: DOK-DL3026,DOK-DL3007 FROM gcr.io/distroless/static:nonroot ARG MAINTAINER="vdaas.org vald team " LABEL maintainer="${MAINTAINER}" @@ -96,5 +114,6 @@ ENV APP_NAME=index COPY --from=builder /usr/bin/${APP_NAME} /usr/bin/${APP_NAME} COPY --from=builder /tmp/config.yaml /etc/server/config.yaml +# skipcq: DOK-DL3002 USER nonroot:nonroot ENTRYPOINT ["/usr/bin/index"] diff --git a/dockers/operator/helm/Dockerfile b/dockers/operator/helm/Dockerfile index 1e7f1a4bf5..61bee2e98f 100644 --- a/dockers/operator/helm/Dockerfile +++ b/dockers/operator/helm/Dockerfile @@ -19,13 +19,16 @@ ARG UPX_OPTIONS=-9 ARG OPERATOR_SDK_VERSION=latest -# skipcq: DOK-DL3026 +# skipcq: DOK-DL3026,DOK-DL3007 FROM quay.io/operator-framework/helm-operator:${OPERATOR_SDK_VERSION} AS operator -# skipcq: DOK-DL3026 +# skipcq: DOK-DL3026,DOK-DL3007 FROM ghcr.io/vdaas/vald/vald-buildbase:nightly AS builder ARG MAINTAINER="vdaas.org vald team " LABEL maintainer="${MAINTAINER}" +# skipcq: DOK-DL3002 +USER root:root + ARG TARGETARCH ARG TARGETOS ARG GO_VERSION @@ -38,14 +41,21 @@ ENV GOROOT=/opt/go ENV HOME=/root ENV INITRD=No ENV LANG=en_US.UTF-8 +ENV LANGUAGE=en_US.UTF-8 +ENV LC_ALL=en_US.UTF-8 ENV ORG=vdaas ENV PKG=operator/helm ENV REPO=vald +ENV TZ=Etc/UTC +ENV USER=root ENV PATH=${GOPATH}/bin:${GOROOT}/bin:/usr/local/bin:${PATH} SHELL ["/bin/bash", "-o", "pipefail", "-c"] # skipcq: DOK-DL3008 -RUN apt-get clean \ +RUN rm -f /etc/apt/apt.conf.d/docker-clean \ + && echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache \ + && echo 'APT::Install-Recommends "false";' > /etc/apt/apt.conf.d/no-install-recommends \ + && apt-get clean \ && rm -rf \ /var/lib/apt/lists/* \ /var/cache/* \ @@ -56,13 +66,21 @@ RUN apt-get clean \ ca-certificates \ curl \ git \ + tzdata \ + locales \ upx \ && ldconfig \ + && echo "${LANG} UTF-8" > /etc/locale.gen \ + && ln -fs /usr/share/zoneinfo/${TZ} /etc/localtime \ + && locale-gen ${LANGUAGE} \ + && update-locale LANG=${LANGUAGE} \ + && dpkg-reconfigure -f noninteractive tzdata \ && apt-get clean \ + && apt-get autoclean -y \ && rm -rf \ /var/lib/apt/lists/* \ /var/cache/* \ - && apt-get autoremove + && apt-get autoremove -y WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} COPY Makefile . @@ -82,7 +100,7 @@ COPY hack . COPY --from=operator /usr/local/bin/${APP_NAME} /usr/bin/${APP_NAME} WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} -#skipcq: DOK-W1001, DOK-SC2086 +#skipcq: DOK-W1001, DOK-SC2086, DOK-DL3008 RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ make GO_VERSION="${GO_VERSION}" go/install \ @@ -103,7 +121,7 @@ RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ && make GOARCH=${TARGETARCH} GOOS=${TARGETOS} helm/schema/vald-helm-operator \ && cp -r charts/* /opt/helm/charts/ \ && upx "/usr/bin/${APP_NAME}" -# skipcq: DOK-DL3026 +# skipcq: DOK-DL3026,DOK-DL3007 FROM gcr.io/distroless/static:nonroot ARG MAINTAINER="vdaas.org vald team " LABEL maintainer="${MAINTAINER}" @@ -114,5 +132,6 @@ COPY --from=builder /usr/bin/${APP_NAME} /usr/bin/${APP_NAME} COPY --from=builder /opt/helm/watches.yaml /opt/helm/watches.yaml COPY --from=builder /opt/helm/charts/vald /opt/helm/charts/vald COPY --from=builder /opt/helm/charts/vald-helm-operator /opt/helm/charts/vald-helm-operator +# skipcq: DOK-DL3002 USER nonroot:nonroot ENTRYPOINT ["/usr/bin/helm-operator", "run", "--watches-file=/opt/helm/watches.yaml"] diff --git a/dockers/tools/benchmark/job/Dockerfile b/dockers/tools/benchmark/job/Dockerfile index a75d7645d7..080fd26058 100644 --- a/dockers/tools/benchmark/job/Dockerfile +++ b/dockers/tools/benchmark/job/Dockerfile @@ -18,11 +18,14 @@ # DO_NOT_EDIT this Dockerfile is generated by hack/docker/gen/main.go ARG UPX_OPTIONS=-9 -# skipcq: DOK-DL3026 +# skipcq: DOK-DL3026,DOK-DL3007 FROM ghcr.io/vdaas/vald/vald-buildbase:nightly AS builder ARG MAINTAINER="vdaas.org vald team " LABEL maintainer="${MAINTAINER}" +# skipcq: DOK-DL3002 +USER root:root + ARG TARGETARCH ARG TARGETOS ARG GO_VERSION @@ -35,14 +38,21 @@ ENV GOROOT=/opt/go ENV HOME=/root ENV INITRD=No ENV LANG=en_US.UTF-8 +ENV LANGUAGE=en_US.UTF-8 +ENV LC_ALL=en_US.UTF-8 ENV ORG=vdaas ENV PKG=tools/benchmark/job ENV REPO=vald +ENV TZ=Etc/UTC +ENV USER=root ENV PATH=${GOPATH}/bin:${GOROOT}/bin:/usr/local/bin:${PATH} SHELL ["/bin/bash", "-o", "pipefail", "-c"] # skipcq: DOK-DL3008 -RUN apt-get clean \ +RUN rm -f /etc/apt/apt.conf.d/docker-clean \ + && echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache \ + && echo 'APT::Install-Recommends "false";' > /etc/apt/apt.conf.d/no-install-recommends \ + && apt-get clean \ && rm -rf \ /var/lib/apt/lists/* \ /var/cache/* \ @@ -53,18 +63,26 @@ RUN apt-get clean \ ca-certificates \ curl \ git \ + tzdata \ + locales \ cmake \ - g++ \ gcc \ + g++ \ unzip \ libhdf5-dev \ libaec-dev \ && ldconfig \ + && echo "${LANG} UTF-8" > /etc/locale.gen \ + && ln -fs /usr/share/zoneinfo/${TZ} /etc/localtime \ + && locale-gen ${LANGUAGE} \ + && update-locale LANG=${LANGUAGE} \ + && dpkg-reconfigure -f noninteractive tzdata \ && apt-get clean \ + && apt-get autoclean -y \ && rm -rf \ /var/lib/apt/lists/* \ /var/cache/* \ - && apt-get autoremove + && apt-get autoremove -y WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} COPY Makefile . @@ -86,7 +104,7 @@ WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/cmd/${PKG} COPY cmd/${PKG} . WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} -#skipcq: DOK-W1001, DOK-SC2086 +#skipcq: DOK-W1001, DOK-SC2086, DOK-DL3008 RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ make GO_VERSION="${GO_VERSION}" go/install \ @@ -94,7 +112,7 @@ RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ && make hdf5/install \ && make GOARCH="${TARGETARCH}" GOOS="${TARGETOS}" REPO="${ORG}" NAME="${REPO}" cmd/${PKG}/${APP_NAME} \ && mv "cmd/${PKG}/${APP_NAME}" "/usr/bin/${APP_NAME}" -# skipcq: DOK-DL3026 +# skipcq: DOK-DL3026,DOK-DL3007 FROM gcr.io/distroless/static:nonroot ARG MAINTAINER="vdaas.org vald team " LABEL maintainer="${MAINTAINER}" @@ -103,5 +121,6 @@ ENV APP_NAME=job COPY --from=builder /usr/bin/${APP_NAME} /usr/bin/${APP_NAME} COPY --from=builder /tmp/config.yaml /etc/server/config.yaml +# skipcq: DOK-DL3002 USER nonroot:nonroot ENTRYPOINT ["/usr/bin/job"] diff --git a/dockers/tools/benchmark/operator/Dockerfile b/dockers/tools/benchmark/operator/Dockerfile index 56a011fcab..11fe30aa80 100644 --- a/dockers/tools/benchmark/operator/Dockerfile +++ b/dockers/tools/benchmark/operator/Dockerfile @@ -18,11 +18,14 @@ # DO_NOT_EDIT this Dockerfile is generated by hack/docker/gen/main.go ARG UPX_OPTIONS=-9 -# skipcq: DOK-DL3026 +# skipcq: DOK-DL3026,DOK-DL3007 FROM ghcr.io/vdaas/vald/vald-buildbase:nightly AS builder ARG MAINTAINER="vdaas.org vald team " LABEL maintainer="${MAINTAINER}" +# skipcq: DOK-DL3002 +USER root:root + ARG TARGETARCH ARG TARGETOS ARG GO_VERSION @@ -35,14 +38,21 @@ ENV GOROOT=/opt/go ENV HOME=/root ENV INITRD=No ENV LANG=en_US.UTF-8 +ENV LANGUAGE=en_US.UTF-8 +ENV LC_ALL=en_US.UTF-8 ENV ORG=vdaas ENV PKG=tools/benchmark/operator ENV REPO=vald +ENV TZ=Etc/UTC +ENV USER=root ENV PATH=${GOPATH}/bin:${GOROOT}/bin:/usr/local/bin:${PATH} SHELL ["/bin/bash", "-o", "pipefail", "-c"] # skipcq: DOK-DL3008 -RUN apt-get clean \ +RUN rm -f /etc/apt/apt.conf.d/docker-clean \ + && echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache \ + && echo 'APT::Install-Recommends "false";' > /etc/apt/apt.conf.d/no-install-recommends \ + && apt-get clean \ && rm -rf \ /var/lib/apt/lists/* \ /var/cache/* \ @@ -53,12 +63,20 @@ RUN apt-get clean \ ca-certificates \ curl \ git \ + tzdata \ + locales \ && ldconfig \ + && echo "${LANG} UTF-8" > /etc/locale.gen \ + && ln -fs /usr/share/zoneinfo/${TZ} /etc/localtime \ + && locale-gen ${LANGUAGE} \ + && update-locale LANG=${LANGUAGE} \ + && dpkg-reconfigure -f noninteractive tzdata \ && apt-get clean \ + && apt-get autoclean -y \ && rm -rf \ /var/lib/apt/lists/* \ /var/cache/* \ - && apt-get autoremove + && apt-get autoremove -y WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} COPY Makefile . @@ -80,14 +98,14 @@ WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/cmd/${PKG} COPY cmd/${PKG} . WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} -#skipcq: DOK-W1001, DOK-SC2086 +#skipcq: DOK-W1001, DOK-SC2086, DOK-DL3008 RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ make GO_VERSION="${GO_VERSION}" go/install \ && make go/download \ && make GOARCH="${TARGETARCH}" GOOS="${TARGETOS}" REPO="${ORG}" NAME="${REPO}" cmd/${PKG}/${APP_NAME} \ && mv "cmd/${PKG}/${APP_NAME}" "/usr/bin/${APP_NAME}" -# skipcq: DOK-DL3026 +# skipcq: DOK-DL3026,DOK-DL3007 FROM gcr.io/distroless/static:nonroot ARG MAINTAINER="vdaas.org vald team " LABEL maintainer="${MAINTAINER}" @@ -96,5 +114,6 @@ ENV APP_NAME=operator COPY --from=builder /usr/bin/${APP_NAME} /usr/bin/${APP_NAME} COPY --from=builder /tmp/config.yaml /etc/server/config.yaml +# skipcq: DOK-DL3002 USER nonroot:nonroot ENTRYPOINT ["/usr/bin/operator"] diff --git a/dockers/tools/cli/loadtest/Dockerfile b/dockers/tools/cli/loadtest/Dockerfile index f92a30cbe1..8ff98a3010 100644 --- a/dockers/tools/cli/loadtest/Dockerfile +++ b/dockers/tools/cli/loadtest/Dockerfile @@ -18,11 +18,14 @@ # DO_NOT_EDIT this Dockerfile is generated by hack/docker/gen/main.go ARG UPX_OPTIONS=-9 -# skipcq: DOK-DL3026 +# skipcq: DOK-DL3026,DOK-DL3007 FROM ghcr.io/vdaas/vald/vald-buildbase:nightly AS builder ARG MAINTAINER="vdaas.org vald team " LABEL maintainer="${MAINTAINER}" +# skipcq: DOK-DL3002 +USER root:root + ARG TARGETARCH ARG TARGETOS ARG GO_VERSION @@ -35,14 +38,21 @@ ENV GOROOT=/opt/go ENV HOME=/root ENV INITRD=No ENV LANG=en_US.UTF-8 +ENV LANGUAGE=en_US.UTF-8 +ENV LC_ALL=en_US.UTF-8 ENV ORG=vdaas ENV PKG=tools/cli/loadtest ENV REPO=vald +ENV TZ=Etc/UTC +ENV USER=root ENV PATH=${GOPATH}/bin:${GOROOT}/bin:/usr/local/bin:${PATH} SHELL ["/bin/bash", "-o", "pipefail", "-c"] # skipcq: DOK-DL3008 -RUN apt-get clean \ +RUN rm -f /etc/apt/apt.conf.d/docker-clean \ + && echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache \ + && echo 'APT::Install-Recommends "false";' > /etc/apt/apt.conf.d/no-install-recommends \ + && apt-get clean \ && rm -rf \ /var/lib/apt/lists/* \ /var/cache/* \ @@ -53,18 +63,26 @@ RUN apt-get clean \ ca-certificates \ curl \ git \ + tzdata \ + locales \ cmake \ - g++ \ gcc \ + g++ \ unzip \ libhdf5-dev \ libaec-dev \ && ldconfig \ + && echo "${LANG} UTF-8" > /etc/locale.gen \ + && ln -fs /usr/share/zoneinfo/${TZ} /etc/localtime \ + && locale-gen ${LANGUAGE} \ + && update-locale LANG=${LANGUAGE} \ + && dpkg-reconfigure -f noninteractive tzdata \ && apt-get clean \ + && apt-get autoclean -y \ && rm -rf \ /var/lib/apt/lists/* \ /var/cache/* \ - && apt-get autoremove + && apt-get autoremove -y WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} COPY Makefile . @@ -88,7 +106,7 @@ WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/cmd/${PKG} COPY cmd/${PKG} . WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} -#skipcq: DOK-W1001, DOK-SC2086 +#skipcq: DOK-W1001, DOK-SC2086, DOK-DL3008 RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ make GO_VERSION="${GO_VERSION}" go/install \ @@ -96,7 +114,7 @@ RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ && make hdf5/install \ && make GOARCH="${TARGETARCH}" GOOS="${TARGETOS}" REPO="${ORG}" NAME="${REPO}" cmd/${PKG}/${APP_NAME} \ && mv "cmd/${PKG}/${APP_NAME}" "/usr/bin/${APP_NAME}" -# skipcq: DOK-DL3026 +# skipcq: DOK-DL3026,DOK-DL3007 FROM gcr.io/distroless/static:nonroot ARG MAINTAINER="vdaas.org vald team " LABEL maintainer="${MAINTAINER}" @@ -105,5 +123,6 @@ ENV APP_NAME=loadtest COPY --from=builder /usr/bin/${APP_NAME} /usr/bin/${APP_NAME} COPY --from=builder /tmp/config.yaml /etc/server/config.yaml +# skipcq: DOK-DL3002 USER nonroot:nonroot ENTRYPOINT ["/usr/bin/loadtest"] diff --git a/go.mod b/go.mod index 9d60dce779..b664b5bdf5 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,7 @@ replace ( cloud.google.com/go/secretmanager => cloud.google.com/go/secretmanager v1.13.5 cloud.google.com/go/storage => cloud.google.com/go/storage v1.43.0 cloud.google.com/go/trace => cloud.google.com/go/trace v1.10.11 - code.cloudfoundry.org/bytefmt => code.cloudfoundry.org/bytefmt v0.0.0-20240725181214-870a2a4a34a6 + code.cloudfoundry.org/bytefmt => code.cloudfoundry.org/bytefmt v0.0.0-20240727181252-5b6127bbde80 contrib.go.opencensus.io/exporter/aws => contrib.go.opencensus.io/exporter/aws v0.0.0-20230502192102-15967c811cec contrib.go.opencensus.io/exporter/prometheus => contrib.go.opencensus.io/exporter/prometheus v0.4.2 contrib.go.opencensus.io/integrations/ocsql => contrib.go.opencensus.io/integrations/ocsql v0.1.7 @@ -154,7 +154,7 @@ replace ( github.com/google/gofuzz => github.com/google/gofuzz v1.2.0 github.com/google/martian => github.com/google/martian v2.1.0+incompatible github.com/google/martian/v3 => github.com/google/martian/v3 v3.3.3 - github.com/google/pprof => github.com/google/pprof v0.0.0-20240722153945-304e4f0156b8 + github.com/google/pprof => github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 github.com/google/shlex => github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 github.com/google/subcommands => github.com/google/subcommands v1.2.0 github.com/google/uuid => github.com/google/uuid v1.6.0 @@ -192,7 +192,7 @@ replace ( github.com/jstemmer/go-junit-report => github.com/jstemmer/go-junit-report v1.0.0 github.com/kisielk/errcheck => github.com/kisielk/errcheck v1.7.0 github.com/kisielk/gotool => github.com/kisielk/gotool v1.0.0 - github.com/klauspost/compress => github.com/klauspost/compress v1.17.10-0.20240719110028-cfab8bd586ec + github.com/klauspost/compress => github.com/klauspost/compress v1.17.10-0.20240726110848-d76f801616d1 github.com/klauspost/cpuid/v2 => github.com/klauspost/cpuid/v2 v2.2.8 github.com/kpango/fastime => github.com/kpango/fastime v1.1.9 github.com/kpango/fuid => github.com/kpango/fuid v0.0.0-20221203053508-503b5ad89aa1 @@ -225,7 +225,7 @@ replace ( github.com/niemeyer/pretty => github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e github.com/nxadm/tail => github.com/nxadm/tail v1.4.11 github.com/onsi/ginkgo => github.com/onsi/ginkgo v1.16.5 - github.com/onsi/ginkgo/v2 => github.com/onsi/ginkgo/v2 v2.19.0 + github.com/onsi/ginkgo/v2 => github.com/onsi/ginkgo/v2 v2.19.1 github.com/onsi/gomega => github.com/onsi/gomega v1.34.0 github.com/peterbourgon/diskv => github.com/peterbourgon/diskv v2.0.1+incompatible github.com/phpdave11/gofpdf => github.com/phpdave11/gofpdf v1.4.2 @@ -329,16 +329,16 @@ replace ( gopkg.in/yaml.v2 => gopkg.in/yaml.v2 v2.4.0 gopkg.in/yaml.v3 => gopkg.in/yaml.v3 v3.0.1 honnef.co/go/tools => honnef.co/go/tools v0.4.7 - k8s.io/api => k8s.io/api v0.30.2 - k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.30.2 - k8s.io/apimachinery => k8s.io/apimachinery v0.30.2 - k8s.io/cli-runtime => k8s.io/cli-runtime v0.30.2 - k8s.io/client-go => k8s.io/client-go v0.30.2 - k8s.io/component-base => k8s.io/component-base v0.30.2 + k8s.io/api => k8s.io/api v0.30.3 + k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.30.3 + k8s.io/apimachinery => k8s.io/apimachinery v0.30.3 + k8s.io/cli-runtime => k8s.io/cli-runtime v0.30.3 + k8s.io/client-go => k8s.io/client-go v0.30.3 + k8s.io/component-base => k8s.io/component-base v0.30.3 k8s.io/klog/v2 => k8s.io/klog/v2 v2.130.1 - k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20240709000822-3c01b740850f - k8s.io/kubernetes => k8s.io/kubernetes v0.30.2 - k8s.io/metrics => k8s.io/metrics v0.30.2 + k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20240726031636-6f6746feab9c + k8s.io/kubernetes => k8s.io/kubernetes v0.30.3 + k8s.io/metrics => k8s.io/metrics v0.30.3 nhooyr.io/websocket => nhooyr.io/websocket v1.8.11 rsc.io/pdf => rsc.io/pdf v0.1.1 sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.18.4 @@ -410,14 +410,14 @@ require ( google.golang.org/grpc v1.65.0 google.golang.org/protobuf v1.34.2 gopkg.in/yaml.v2 v2.4.0 - k8s.io/api v0.30.2 - k8s.io/apimachinery v0.30.2 + k8s.io/api v0.30.3 + k8s.io/apimachinery v0.30.3 k8s.io/cli-runtime v0.0.0-00010101000000-000000000000 - k8s.io/client-go v0.30.2 + k8s.io/client-go v0.30.3 k8s.io/metrics v0.0.0-00010101000000-000000000000 k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 sigs.k8s.io/controller-runtime v0.0.0-00010101000000-000000000000 - sigs.k8s.io/yaml v1.3.0 + sigs.k8s.io/yaml v1.4.0 ) require ( @@ -437,7 +437,7 @@ require ( github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect - github.com/emicklei/go-restful/v3 v3.11.0 // indirect + github.com/emicklei/go-restful/v3 v3.12.1 // indirect github.com/evanphx/json-patch v4.12.0+incompatible // indirect github.com/evanphx/json-patch/v5 v5.9.0 // indirect github.com/felixge/httpsnoop v1.0.4 // indirect @@ -447,7 +447,7 @@ require ( github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-openapi/jsonpointer v0.21.0 // indirect - github.com/go-openapi/jsonreference v0.20.2 // indirect + github.com/go-openapi/jsonreference v0.21.0 // indirect github.com/go-openapi/swag v0.23.0 // indirect github.com/go-pdf/fpdf v0.9.0 // indirect github.com/go-toolsmith/astcopy v1.0.2 // indirect @@ -461,7 +461,7 @@ require ( github.com/google/btree v1.1.2 // indirect github.com/google/gnostic-models v0.6.8 // indirect github.com/google/gofuzz v1.2.0 // indirect - github.com/google/pprof v0.0.0-20240722153945-304e4f0156b8 // indirect + github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 // indirect github.com/google/s2a-go v0.1.7 // indirect github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect github.com/google/wire v0.6.0 // indirect @@ -518,7 +518,7 @@ require ( gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/apiextensions-apiserver v0.30.1 // indirect - k8s.io/klog/v2 v2.120.1 // indirect + k8s.io/klog/v2 v2.130.1 // indirect k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect diff --git a/go.sum b/go.sum index 5e3d7727bb..5d764d8669 100644 --- a/go.sum +++ b/go.sum @@ -156,8 +156,8 @@ cloud.google.com/go/vpcaccess v1.7.10/go.mod h1:69kdbMh8wvGcM3agEHP1YnHPyxIBSRcZ cloud.google.com/go/webrisk v1.9.10/go.mod h1:wDxtALjJMXlGR2c3qtZaVI5jRKcneIMTYqV1IA1jPmo= cloud.google.com/go/websecurityscanner v1.6.10/go.mod h1:ndil05bWkG/KDgWAXwFFAuvOYcOKu+mk/wC/nIfLQwE= cloud.google.com/go/workflows v1.12.9/go.mod h1:g9S8NdA20MnQTReKVrXCDsnPrOsNgwonY7xZn+vr3SY= -code.cloudfoundry.org/bytefmt v0.0.0-20240725181214-870a2a4a34a6 h1:5wA7H4/Uyij80SkebgeIbSSUw14EzaaWw8/VSt/9ke8= -code.cloudfoundry.org/bytefmt v0.0.0-20240725181214-870a2a4a34a6/go.mod h1:0WabI+CfmksKbGuDTQSdOtS0iIfrWLzjLVbgviM82Hg= +code.cloudfoundry.org/bytefmt v0.0.0-20240727181252-5b6127bbde80 h1:32ycowbmEGb+g1raMsf6VnEycfByxPtgnGY0UOeYWYI= +code.cloudfoundry.org/bytefmt v0.0.0-20240727181252-5b6127bbde80/go.mod h1:gsyTe3p9/Wh4+2zPVyMQwBN9ltHPAHvpixE0q2RDsE4= dmitri.shuralyov.com/gpu/mtl v0.0.0-20201218220906-28db891af037/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= dmitri.shuralyov.com/gpu/mtl v0.0.0-20221208032759-85de2813cf6b/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= eliasnaur.com/font v0.0.0-20230308162249-dd43949cb42d/go.mod h1:OYVuxibdk9OSLX8vAqydtRPP87PyTFcT9uH3MlEGBQA= @@ -407,8 +407,8 @@ github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/martian/v3 v3.3.3 h1:DIhPTQrbPkgs2yJYdXU/eNACCG5DVQjySNRNlflZ9Fc= github.com/google/martian/v3 v3.3.3/go.mod h1:iEPrYcgCF7jA9OtScMFQyAlZZ4YXTKEtJ1E6RWzmBA0= -github.com/google/pprof v0.0.0-20240722153945-304e4f0156b8 h1:ssNFCCVmib/GQSzx3uCWyfMgOamLGWuGqlMS77Y1m3Y= -github.com/google/pprof v0.0.0-20240722153945-304e4f0156b8/go.mod h1:K1liHPHnj73Fdn/EKuT8nrFqBihUSKXoLYU0BuatOYo= +github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 h1:FKHo8hFI3A+7w0aUQuYXQ+6EN5stWmeY/AZqtM8xk9k= +github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8/go.mod h1:K1liHPHnj73Fdn/EKuT8nrFqBihUSKXoLYU0BuatOYo= github.com/google/s2a-go v0.1.3/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A= github.com/google/s2a-go v0.1.4/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A= github.com/google/s2a-go v0.1.7 h1:60BLSyTrOV4/haCDW4zb1guZItoSq8foHCXrAnjBo/o= @@ -480,8 +480,8 @@ github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:C github.com/kisielk/errcheck v1.7.0/go.mod h1:1kLL+jV4e+CFfueBmI1dSK2ADDyQnlrnrY/FqKluHJQ= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/asmfmt v1.3.2/go.mod h1:AG8TuvYojzulgDAMCnYn50l/5QV3Bs/tp6j0HLHbNSE= -github.com/klauspost/compress v1.17.10-0.20240719110028-cfab8bd586ec h1:S0mztzoHWmIpI4VuqO7MPIf3DQQxWwW5e3Uurb+HMHA= -github.com/klauspost/compress v1.17.10-0.20240719110028-cfab8bd586ec/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= +github.com/klauspost/compress v1.17.10-0.20240726110848-d76f801616d1 h1:j6tQDRDYFVnxj0AHKoolYgdATzzNUR8aySZLFF3cuag= +github.com/klauspost/compress v1.17.10-0.20240726110848-d76f801616d1/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= github.com/klauspost/cpuid/v2 v2.2.8 h1:+StwCXwm9PdpiEkPyzBXIy+M9KUb4ODm0Zarf1kS5BM= github.com/klauspost/cpuid/v2 v2.2.8/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= github.com/kpango/fastime v1.1.9 h1:xVQHcqyPt5M69DyFH7g1EPRns1YQNap9d5eLhl/Jy84= @@ -547,8 +547,8 @@ github.com/nxadm/tail v1.4.11 h1:8feyoE3OzPrcshW5/MJ4sGESc5cqmGkGCWlco4l0bqY= github.com/nxadm/tail v1.4.11/go.mod h1:OTaG3NK980DZzxbRq6lEuzgU+mug70nY11sMd4JXXHc= github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= -github.com/onsi/ginkgo/v2 v2.19.0 h1:9Cnnf7UHo57Hy3k6/m5k3dRfGTMXGvxhHFvkDTCTpvA= -github.com/onsi/ginkgo/v2 v2.19.0/go.mod h1:rlwLi9PilAFJ8jCg9UE1QP6VBpd6/xj3SRC0d6TU0To= +github.com/onsi/ginkgo/v2 v2.19.1 h1:QXgq3Z8Crl5EL1WBAC98A5sEBHARrAJNzAmMxzLcRF0= +github.com/onsi/ginkgo/v2 v2.19.1/go.mod h1:O3DtEWQkPa/F7fBMgmZQKKsluAy8pd3rEQdrjkPb9zA= github.com/onsi/gomega v1.34.0 h1:eSSPsPNp6ZpsG8X1OVmOTxig+CblTc4AxpPBykhe2Os= github.com/onsi/gomega v1.34.0/go.mod h1:MIKI8c+f+QLWk+hxbePD4i0LMJSExPaZOVfkoex4cAo= github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI= @@ -748,22 +748,22 @@ gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gotest.tools/v3 v3.5.1/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU= honnef.co/go/js/dom v0.0.0-20210725211120-f030747120f2/go.mod h1:sUMDUKNB2ZcVjt92UnLy3cdGs+wDAcrPdV3JP6sVgA4= honnef.co/go/tools v0.4.7/go.mod h1:+rnGS1THNh8zMwnd2oVOTL9QF6vmfyG6ZXBULae2uc0= -k8s.io/api v0.30.2 h1:+ZhRj+28QT4UOH+BKznu4CBgPWgkXO7XAvMcMl0qKvI= -k8s.io/api v0.30.2/go.mod h1:ULg5g9JvOev2dG0u2hig4Z7tQ2hHIuS+m8MNZ+X6EmI= -k8s.io/apiextensions-apiserver v0.30.2 h1:l7Eue2t6QiLHErfn2vwK4KgF4NeDgjQkCXtEbOocKIE= -k8s.io/apiextensions-apiserver v0.30.2/go.mod h1:lsJFLYyK40iguuinsb3nt+Sj6CmodSI4ACDLep1rgjw= -k8s.io/apimachinery v0.30.2 h1:fEMcnBj6qkzzPGSVsAZtQThU62SmQ4ZymlXRC5yFSCg= -k8s.io/apimachinery v0.30.2/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc= -k8s.io/cli-runtime v0.30.2 h1:ooM40eEJusbgHNEqnHziN9ZpLN5U4WcQGsdLKVxpkKE= -k8s.io/cli-runtime v0.30.2/go.mod h1:Y4g/2XezFyTATQUbvV5WaChoUGhojv/jZAtdp5Zkm0A= -k8s.io/client-go v0.30.2 h1:sBIVJdojUNPDU/jObC+18tXWcTJVcwyqS9diGdWHk50= -k8s.io/client-go v0.30.2/go.mod h1:JglKSWULm9xlJLx4KCkfLLQ7XwtlbflV6uFFSHTMgVs= +k8s.io/api v0.30.3 h1:ImHwK9DCsPA9uoU3rVh4QHAHHK5dTSv1nxJUapx8hoQ= +k8s.io/api v0.30.3/go.mod h1:GPc8jlzoe5JG3pb0KJCSLX5oAFIW3/qNJITlDj8BH04= +k8s.io/apiextensions-apiserver v0.30.3 h1:oChu5li2vsZHx2IvnGP3ah8Nj3KyqG3kRSaKmijhB9U= +k8s.io/apiextensions-apiserver v0.30.3/go.mod h1:uhXxYDkMAvl6CJw4lrDN4CPbONkF3+XL9cacCT44kV4= +k8s.io/apimachinery v0.30.3 h1:q1laaWCmrszyQuSQCfNB8cFgCuDAoPszKY4ucAjDwHc= +k8s.io/apimachinery v0.30.3/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc= +k8s.io/cli-runtime v0.30.3 h1:aG69oRzJuP2Q4o8dm+f5WJIX4ZBEwrvdID0+MXyUY6k= +k8s.io/cli-runtime v0.30.3/go.mod h1:hwrrRdd9P84CXSKzhHxrOivAR9BRnkMt0OeP5mj7X30= +k8s.io/client-go v0.30.3 h1:bHrJu3xQZNXIi8/MoxYtZBBWQQXwy16zqJwloXXfD3k= +k8s.io/client-go v0.30.3/go.mod h1:8d4pf8vYu665/kUbsxWAQ/JDBNWqfFeZnvFiVdmx89U= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= -k8s.io/kube-openapi v0.0.0-20240709000822-3c01b740850f h1:2sXuKesAYbRHxL3aE2PN6zX/gcJr22cjrsej+W784Tc= -k8s.io/kube-openapi v0.0.0-20240709000822-3c01b740850f/go.mod h1:UxDHUPsUwTOOxSU+oXURfFBcAS6JwiRXTYqYwfuGowc= -k8s.io/metrics v0.30.2 h1:zj4kIPTCfEbY0RHEogpA7QtlItU7xaO11+Gz1zVDxlc= -k8s.io/metrics v0.30.2/go.mod h1:GpoO5XTy/g8CclVLtgA5WTrr2Cy5vCsqr5Xa/0ETWIk= +k8s.io/kube-openapi v0.0.0-20240726031636-6f6746feab9c h1:CHL3IcTrTI3csK36iwYJy36uQRic+IpSoRMNH+0I8SE= +k8s.io/kube-openapi v0.0.0-20240726031636-6f6746feab9c/go.mod h1:0CVn9SVo8PeW5/JgsBZZIFmmTk5noOM8WXf2e1tCihE= +k8s.io/metrics v0.30.3 h1:gKCpte5zykrOmQhZ8qmsxyJslMdiLN+sqbBfIWNpbGM= +k8s.io/metrics v0.30.3/go.mod h1:W06L2nXRhOwPkFYDJYWdEIS3u6JcJy3ebIPYbndRs6A= k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A= k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= lukechampine.com/uint128 v1.1.1/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk= diff --git a/hack/docker/gen/main.go b/hack/docker/gen/main.go index 34c9425864..740df401ba 100644 --- a/hack/docker/gen/main.go +++ b/hack/docker/gen/main.go @@ -61,14 +61,17 @@ ARG UPX_OPTIONS=-9 ARG {{$key}}={{$value}} {{- end}} {{- range $image := .ExtraImages }} -# skipcq: DOK-DL3026 +# skipcq: DOK-DL3026,DOK-DL3007 FROM {{$image}} {{- end}} -# skipcq: DOK-DL3026 +# skipcq: DOK-DL3026,DOK-DL3007 FROM {{.BuilderImage}}:{{.BuilderTag}}{{- if not .DevContainer}} AS builder {{- end}} ARG MAINTAINER="{{.Maintainer}}" LABEL maintainer="${MAINTAINER}" +# skipcq: DOK-DL3002 +USER {{.BuildUser}} + ARG TARGETARCH ARG TARGETOS ARG GO_VERSION @@ -80,7 +83,10 @@ ENV {{$keyValue}} SHELL ["/bin/bash", "-o", "pipefail", "-c"] # skipcq: DOK-DL3008 -RUN apt-get clean \ +RUN rm -f /etc/apt/apt.conf.d/docker-clean \ + && echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache \ + && echo 'APT::Install-Recommends "false";' > /etc/apt/apt.conf.d/no-install-recommends \ + && apt-get clean \ && rm -rf \ /var/lib/apt/lists/* \ /var/cache/* \ @@ -91,15 +97,23 @@ RUN apt-get clean \ ca-certificates \ curl \ git \ + tzdata \ + locales \ {{- range $epkg := .ExtraPackages }} {{$epkg}} \ {{- end}} && ldconfig \ + && echo "${LANG} UTF-8" > /etc/locale.gen \ + && ln -fs /usr/share/zoneinfo/${TZ} /etc/localtime \ + && locale-gen ${LANGUAGE} \ + && update-locale LANG=${LANGUAGE} \ + && dpkg-reconfigure -f noninteractive tzdata \ && apt-get clean \ + && apt-get autoclean -y \ && rm -rf \ /var/lib/apt/lists/* \ /var/cache/* \ - && apt-get autoremove + && apt-get autoremove -y WORKDIR {{.RootDir}}/${ORG}/${REPO} COPY Makefile . @@ -120,23 +134,22 @@ COPY cmd/${PKG}/sample.yaml {{$.TmpConfigPath}} WORKDIR {{$.RootDir}}/${ORG}/${REPO}/{{$files}} COPY {{$files}} . {{- end}} -{{- range $files := .ExtraCopies }} -COPY {{$files}} -{{- end}} - {{- else}} WORKDIR {{.RootDir}}/${ORG}/${REPO} COPY . . {{- end}} +{{- range $files := .ExtraCopies }} +COPY {{$files}} +{{- end}} WORKDIR {{.RootDir}}/${ORG}/${REPO} {{- if .RunCommands}} -#skipcq: DOK-W1001, DOK-SC2086 +#skipcq: DOK-W1001, DOK-SC2086, DOK-DL3008 RUN {{RunCommands .RunCommands}} {{- end}} {{- if not .DevContainer}} -# skipcq: DOK-DL3026 +# skipcq: DOK-DL3026,DOK-DL3007 FROM {{.RuntimeImage}}:{{.RuntimeTag}} ARG MAINTAINER="{{.Maintainer}}" LABEL maintainer="${MAINTAINER}" @@ -150,14 +163,16 @@ COPY --from=builder {{$.TmpConfigPath}} /etc/server/config.yaml {{- range $from, $file := .StageFiles }} COPY --from=builder {{$file}} {{$file}} {{- end}} -USER nonroot:nonroot +{{- end}} +# skipcq: DOK-DL3002 +USER {{.RuntimeUser}} {{- if .Entrypoints}} ENTRYPOINT [{{Entrypoint .Entrypoints}}] -{{- else}} +{{- else if not .DevContainer}} ENTRYPOINT ["{{.BinDir}}/{{.AppName}}"] {{- end}} -{{- end}}` +` var docker = template.Must(template.New("Dockerfile").Funcs(template.FuncMap{ "RunCommands": func(commands []string) string { @@ -188,6 +203,7 @@ type Data struct { ContainerType ContainerType AppName string BinDir string + BuildUser string BuilderImage string BuilderTag string Maintainer string @@ -195,6 +211,7 @@ type Data struct { RootDir string RuntimeImage string RuntimeTag string + RuntimeUser string TmpConfigPath string Arguments map[string]string Environments map[string]string @@ -214,15 +231,18 @@ type ContainerType int const ( organization = "vdaas" repository = "vald" - minimumArgumentLength = 2 + defaultBinaryDir = "/usr/bin" + defaultBuilderImage = "ghcr.io/vdaas/vald/vald-buildbase" + defaultBuilderTag = "nightly" + defaultLanguage = "en_US.UTF-8" defaultMaintainer = organization + ".org " + repository + " team <" + repository + "@" + organization + ".org>" - maintainerKey = "MAINTAINER" defaultRuntimeImage = "gcr.io/distroless/static" defaultRuntimeTag = "nonroot" - defaultBuilderImage = "ghcr.io/vdaas/vald/vald-buildbase" - defaultBuilderTag = "nightly" - defaultBinaryDir = "/usr/bin" defaultTmpConfigPath = "/tmp/config.yaml" + defaultRuntimeUser = "nonroot:nonroot" + defaultBuildUser = "root:root" + maintainerKey = "MAINTAINER" + minimumArgumentLength = 2 goWorkdir = "${GOPATH}/src/github.com" rustWorkdir = "${HOME}/rust/src/github.com" @@ -249,9 +269,13 @@ var ( defaultEnvironments = map[string]string{ "DEBIAN_FRONTEND": "noninteractive", "HOME": "/root", + "USER": "root", "INITRD": "No", - "LANG": "en_US.UTF-8", + "LANG": defaultLanguage, + "LANGUAGE": defaultLanguage, + "LC_ALL": defaultLanguage, "ORG": organization, + "TZ": "Etc/UTC", "PATH": "${PATH}:/usr/local/bin", "REPO": repository, } @@ -303,8 +327,8 @@ var ( clangBuildDeps = []string{ "cmake", - "g++", "gcc", + "g++", "unzip", } ngtBuildDeps = []string{ @@ -316,24 +340,32 @@ var ( "gfortran", } devContainerDeps = []string{ - "curl", "gawk", - "git", "gnupg2", "graphviz", "jq", "libhdf5-dev", "libaec-dev", - "nodejs", - "npm", "sed", "zip", } ciContainerPreprocess = []string{ + "curl -fsSL https://deb.nodesource.com/setup_current.x | bash -", + "apt-get clean", + "rm -rf /var/lib/apt/lists/* /var/cache/*", + "apt-get update -y", + "apt-get upgrade -y", + "apt-get install -y --no-install-recommends --fix-missing nodejs libssl-dev", + "npm install -g npm@latest", + "apt-get clean", + "apt-get autoclean -y", + "rm -rf /var/lib/apt/lists/* /var/cache/*", + "apt-get autoremove -y", "make GOARCH=${TARGETARCH} GOOS=${TARGETOS} deps GO_CLEAN_DEPS=false", "make GOARCH=${TARGETARCH} GOOS=${TARGETOS} golangci-lint/install", "make GOARCH=${TARGETARCH} GOOS=${TARGETOS} gotestfmt/install", + "make cmake/install", "make buf/install", "make hdf5/install", "make helm-docs/install", @@ -385,6 +417,9 @@ func appendM[K comparable](maps ...map[K]string) map[K]string { if strings.Contains(v, "${PATH}:") { v = strings.TrimPrefix(strings.ReplaceAll(strings.ReplaceAll(v, "${PATH}", ""), "::", ":")+":${PATH}", ":") } + if strings.Contains(v, ":unix") { + v = "unix:" + strings.TrimSuffix(v, ":unix") + } result[k] = v } return result @@ -461,7 +496,7 @@ func main() { defer cancel() maintainer := os.Getenv(maintainerKey) - if len(maintainer) == 0 { + if maintainer == "" { maintainer = defaultMaintainer } year := time.Now().Year() @@ -612,7 +647,10 @@ func main() { AppName: "ci-container", DevContainer: true, ContainerType: DevContainer, + BuilderImage: "ghcr.io/actions-runner-controller/actions-runner-controller/actions-runner-dind", + BuilderTag: "latest", PackageDir: "ci/base", + RuntimeUser: defaultBuildUser, ExtraPackages: append(clangBuildDeps, append(ngtBuildDeps, append(faissBuildDeps, @@ -623,11 +661,28 @@ func main() { "sysctl -w net.ipv6.conf.lo.disable_ipv6=1", "sysctl -p", }, append(ciContainerPreprocess, ngtPreprocess, faissPreprocess)...), + ExtraCopies: []string{ + "--from=docker /usr/local/bin/dind {{$.BinDir}}/dind", + "--from=docker /usr/local/bin/docker {{$.BinDir}}/docker", + "--from=docker /usr/local/bin/docker-entrypoint.sh {{$.BinDir}}/docker-entrypoint.sh", + "--from=docker /usr/local/bin/docker-init {{$.BinDir}}/docker-init", + "--from=docker /usr/local/bin/docker-proxy {{$.BinDir}}/docker-proxy", + "--from=docker /usr/local/bin/dockerd {{$.BinDir}}/dockerd", + "--from=docker /usr/local/bin/dockerd-entrypoint.sh {{$.BinDir}}/dockerd-entrypoint.sh", + "--from=docker /usr/local/bin/modprobe {{$.BinDir}}/modprobe", + "--from=docker /usr/local/bin/runc {{$.BinDir}}/runc", + }, + ExtraImages: []string{ + "docker:rc-dind AS docker", + }, + Entrypoints: []string{"/bin/bash", "-c", "/usr/bin/entrypoint-dind.sh"}, }, "vald-dev-container": { AppName: "dev-container", BuilderImage: "mcr.microsoft.com/vscode/devcontainers/base", BuilderTag: "debian", + BuildUser: defaultBuildUser, + RuntimeUser: defaultBuildUser, DevContainer: true, ContainerType: DevContainer, PackageDir: "dev", @@ -665,6 +720,13 @@ func main() { if data.BuilderTag == "" { data.BuilderTag = defaultBuilderTag } + if data.RuntimeUser == "" { + data.RuntimeUser = defaultRuntimeUser + } + + if data.BuildUser == "" { + data.BuildUser = defaultBuildUser + } if data.CopyDirectories != nil { data.CopyDirectories = append(defaultCopyDirectories, data.CopyDirectories...) @@ -701,12 +763,13 @@ func main() { if data.Preprocess != nil { commands = append(commands, data.Preprocess...) } - data.RunCommands = append(commands, rustBuildCommands...) + commands = append(commands, rustBuildCommands...) + data.RunCommands = commands case DevContainer: data.CopyDirectories = append(data.CopyDirectories, append(goDefaultCopyDirectories, rustDefaultCopyDirectories...)...) data.Environments = appendM(data.Environments, goDefaultEnvironments, rustDefaultEnvironments) data.RootDir = goWorkdir - commands := make([]string, 0, len(goInstallCommands)+len(rustInstallCommands)+len(data.Preprocess)) + commands := make([]string, 0, len(goInstallCommands)+len(rustInstallCommands)+len(data.Preprocess)+1) commands = append(commands, append(goInstallCommands, rustInstallCommands...)...) if data.Preprocess != nil { commands = append(commands, data.Preprocess...) @@ -726,6 +789,17 @@ func main() { data.RootDir = "${HOME}" data.Environments["ROOTDIR"] = os.Args[1] } + if strings.Contains(data.BuildUser, "root") { + data.Environments["HOME"] = "/root" + data.Environments["USER"] = "root" + } else { + user := data.BuildUser + if strings.Contains(user, ":") { + user = strings.SplitN(user, ":", 2)[0] + } + data.Environments["HOME"] = "/home/" + user + data.Environments["USER"] = user + } data.Environments["APP_NAME"] = data.AppName data.Environments["PKG"] = data.PackageDir @@ -733,7 +807,7 @@ func main() { data.ConfigExists = file.Exists(file.Join(os.Args[1], "cmd", data.PackageDir, "sample.yaml")) buf := bytes.NewBuffer(make([]byte, 0, len(tmpl))) - log.Infof("generating %s's docker file", name) + log.Infof("Generating %s's Dockerfile", name) docker.Execute(buf, data) tpl := buf.String() buf.Reset() diff --git a/hack/go.mod.default b/hack/go.mod.default index c33a973129..c55303d4ce 100644 --- a/hack/go.mod.default +++ b/hack/go.mod.default @@ -329,16 +329,16 @@ replace ( gopkg.in/yaml.v2 => gopkg.in/yaml.v2 upgrade gopkg.in/yaml.v3 => gopkg.in/yaml.v3 upgrade honnef.co/go/tools => honnef.co/go/tools upgrade - k8s.io/api => k8s.io/api v0.30.2 - k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.30.2 - k8s.io/apimachinery => k8s.io/apimachinery v0.30.2 - k8s.io/cli-runtime => k8s.io/cli-runtime v0.30.2 - k8s.io/client-go => k8s.io/client-go v0.30.2 - k8s.io/component-base => k8s.io/component-base v0.30.2 + k8s.io/api => k8s.io/api v0.30.3 + k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.30.3 + k8s.io/apimachinery => k8s.io/apimachinery v0.30.3 + k8s.io/cli-runtime => k8s.io/cli-runtime v0.30.3 + k8s.io/client-go => k8s.io/client-go v0.30.3 + k8s.io/component-base => k8s.io/component-base v0.30.3 k8s.io/klog/v2 => k8s.io/klog/v2 upgrade k8s.io/kube-openapi => k8s.io/kube-openapi master - k8s.io/kubernetes => k8s.io/kubernetes v0.30.2 - k8s.io/metrics => k8s.io/metrics v0.30.2 + k8s.io/kubernetes => k8s.io/kubernetes v0.30.3 + k8s.io/metrics => k8s.io/metrics v0.30.3 nhooyr.io/websocket => nhooyr.io/websocket upgrade rsc.io/pdf => rsc.io/pdf upgrade sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.18.4 diff --git a/pkg/agent/core/ngt/handler/grpc/search_test.go b/pkg/agent/core/ngt/handler/grpc/search_test.go index 936998bdce..1ef340e2c4 100644 --- a/pkg/agent/core/ngt/handler/grpc/search_test.go +++ b/pkg/agent/core/ngt/handler/grpc/search_test.go @@ -92,7 +92,8 @@ func Test_server_Search(t *testing.T) { } } if gotSize := len(gotRes.GetResults()); gotSize != w.resultSize { - return errors.Errorf("got size: \"%#v\",\n\t\t\t\twant size: \"%#v\"", gotSize, w.resultSize) + res, _ := gotRes.MarshalJSON() + return errors.Errorf("got size: \"%#v\",\n\t\t\t\twant size: \"%#v\"\ngotResults: \"%s\"", gotSize, w.resultSize, string(res)) } return nil } diff --git a/rust/Cargo.lock b/rust/Cargo.lock index 787aebcaa7..24f2bfae51 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -958,9 +958,9 @@ dependencies = [ [[package]] name = "tokio" -version = "1.39.1" +version = "1.39.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d040ac2b29ab03b09d4129c2f5bbd012a3ac2f79d38ff506a4bf8dd34b0eac8a" +checksum = "daa4fb1bc778bd6f04cbfc4bb2d06a7396a8f299dc33ea1900cedaa316f467b1" dependencies = [ "backtrace", "bytes", diff --git a/versions/CMAKE_VERSION b/versions/CMAKE_VERSION new file mode 100644 index 0000000000..72bde0ab2a --- /dev/null +++ b/versions/CMAKE_VERSION @@ -0,0 +1 @@ +3.30.1 diff --git a/versions/OPERATOR_SDK_VERSION b/versions/OPERATOR_SDK_VERSION index 251643f6ba..2f2ce0df61 100644 --- a/versions/OPERATOR_SDK_VERSION +++ b/versions/OPERATOR_SDK_VERSION @@ -1 +1 @@ -v1.35 +v1.33 diff --git a/versions/PROMETHEUS_STACK_VERSION b/versions/PROMETHEUS_STACK_VERSION index d16771deca..a97254a369 100644 --- a/versions/PROMETHEUS_STACK_VERSION +++ b/versions/PROMETHEUS_STACK_VERSION @@ -1 +1 @@ -61.3.2 +61.5.0