Skip to content

Commit

Permalink
change app name
Browse files Browse the repository at this point in the history
  • Loading branch information
ykadowak committed Oct 2, 2023
1 parent 12272cd commit 6be6278
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 16 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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/**"
Expand All @@ -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/**"
Expand All @@ -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/**"
Expand All @@ -74,5 +74,5 @@ jobs:
build:
uses: ./.github/workflows/_docker-image.yaml
with:
target: index-job-correction
target: index-correction
secrets: inherit
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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>"

Expand Down
14 changes: 7 additions & 7 deletions Makefile.d/docker.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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)
6 changes: 3 additions & 3 deletions dockers/index/job/correction/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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"]

0 comments on commit 6be6278

Please sign in to comment.