From 6be62781357a32b012b739c2f452c7e64942c5d2 Mon Sep 17 00:00:00 2001 From: ykadowak Date: Mon, 2 Oct 2023 06:20:43 +0000 Subject: [PATCH] change app name --- ...correction.yml => dockers-index-correction.yml} | 10 +++++----- Makefile | 2 +- Makefile.d/docker.mk | 14 +++++++------- dockers/index/job/correction/Dockerfile | 6 +++--- 4 files changed, 16 insertions(+), 16 deletions(-) rename .github/workflows/{dockers-index-job-correction.yml => dockers-index-correction.yml} (88%) diff --git a/.github/workflows/dockers-index-job-correction.yml b/.github/workflows/dockers-index-correction.yml similarity index 88% rename from .github/workflows/dockers-index-job-correction.yml rename to .github/workflows/dockers-index-correction.yml index 624b3e5cbe6..3d6ada85a48 100644 --- a/.github/workflows/dockers-index-job-correction.yml +++ b/.github/workflows/dockers-index-correction.yml @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # -name: "Build docker image: index-job-correction" +name: "Build docker image: index-correction" on: push: branches: @@ -25,7 +25,7 @@ on: - "v*.*.*-*" paths: - ".github/actions/docker-build/actions.yaml" - - ".github/workflows/dockers-index-job-correction.yml" + - ".github/workflows/dockers-index-correction.yml" - "go.mod" - "go.sum" - "internal/**" @@ -41,7 +41,7 @@ on: paths: - ".github/actions/docker-build/actions.yaml" - ".github/workflows/_docker-image.yaml" - - ".github/workflows/dockers-index-job-correction.yml" + - ".github/workflows/dockers-index-correction.yml" - "go.mod" - "go.sum" - "internal/**" @@ -57,7 +57,7 @@ on: paths: - ".github/actions/docker-build/actions.yaml" - ".github/workflows/_docker-image.yaml" - - ".github/workflows/dockers-index-job-correction.yml" + - ".github/workflows/dockers-index-correction.yml" - "go.mod" - "go.sum" - "internal/**" @@ -74,5 +74,5 @@ jobs: build: uses: ./.github/workflows/_docker-image.yaml with: - target: index-job-correction + target: index-correction secrets: inherit diff --git a/Makefile b/Makefile index 7933a896894..d859cef45db 100644 --- a/Makefile +++ b/Makefile @@ -30,7 +30,7 @@ FILTER_GATEWAY_IMAGE = $(NAME)-filter-gateway HELM_OPERATOR_IMAGE = $(NAME)-helm-operator LB_GATEWAY_IMAGE = $(NAME)-lb-gateway LOADTEST_IMAGE = $(NAME)-loadtest -INDEX_JOB_CORRECTION_IMAGE = $(NAME)-index-job-correction +INDEX_CORRECTION_IMAGE = $(NAME)-index-correction MANAGER_INDEX_IMAGE = $(NAME)-manager-index MAINTAINER = "$(ORG).org $(NAME) team <$(NAME)@$(ORG).org>" diff --git a/Makefile.d/docker.mk b/Makefile.d/docker.mk index eed7283a460..5771c857e63 100644 --- a/Makefile.d/docker.mk +++ b/Makefile.d/docker.mk @@ -189,16 +189,16 @@ docker/build/loadtest: --build-arg MAINTAINER=$(MAINTAINER) \ --build-arg GO_VERSION=$(GO_VERSION) -.PHONY: docker/name/index-job-correction -docker/name/index-job-correction: - @echo "$(ORG)/$(INDEX_JOB_CORRECTION_IMAGE)" +.PHONY: docker/name/index-correction +docker/name/index-correction: + @echo "$(ORG)/$(INDEX_CORRECTION_IMAGE)" -.PHONY: docker/build/index-job-correction -## build index-job-correction image -docker/build/index-job-correction: +.PHONY: docker/build/index-correction +## build index-correction image +docker/build/index-correction: $(DOCKER) build \ $(DOCKER_OPTS) \ -f dockers/index/job/correction/Dockerfile \ - -t $(ORG)/$(INDEX_JOB_CORRECTION_IMAGE):$(TAG) . \ + -t $(ORG)/$(INDEX_CORRECTION_IMAGE):$(TAG) . \ --build-arg MAINTAINER=$(MAINTAINER) \ --build-arg GO_VERSION=$(GO_VERSION) diff --git a/dockers/index/job/correction/Dockerfile b/dockers/index/job/correction/Dockerfile index a065c2cb406..1938e2531f9 100644 --- a/dockers/index/job/correction/Dockerfile +++ b/dockers/index/job/correction/Dockerfile @@ -33,7 +33,7 @@ ENV PATH ${PATH}:${GOROOT}/bin:${GOPATH}/bin ENV ORG vdaas ENV REPO vald ENV PKG index/job/correction -ENV APP_NAME correction +ENV APP_NAME index-correction # skipcq: DOK-DL3008 RUN apt-get update && apt-get install -y --no-install-recommends \ @@ -83,11 +83,11 @@ RUN cp sample.yaml /tmp/config.yaml FROM ${DISTROLESS_IMAGE}:${DISTROLESS_IMAGE_TAG} LABEL maintainer="${MAINTAINER}" -ENV APP_NAME correction +ENV APP_NAME index-correction COPY --from=builder /usr/bin/${APP_NAME} /go/bin/${APP_NAME} COPY --from=builder /tmp/config.yaml /etc/server/config.yaml USER nonroot:nonroot -ENTRYPOINT ["/go/bin/correction"] +ENTRYPOINT ["/go/bin/index-correction"]