📦 Build schemas when building helm-operator image

Signed-off-by: Rintaro Okamura <rintaro.okamura@gmail.com>
vdaas · Dec 9, 2020 · eaf9eb0 · eaf9eb0
1 parent a5adfe7
commit eaf9eb0
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 3 deletions.
diff --git a/Makefile.d/docker.mk b/Makefile.d/docker.mk
@@ -243,6 +243,7 @@ docker/build/operator/helm:
 	    $(DOCKER_OPTS) \
 	    -f dockers/operator/helm/Dockerfile \
 	    -t $(REPO)/$(HELM_OPERATOR_IMAGE):$(TAG) . \
+	    --build-arg BASE_TAG=$(TAG) \
 	    --build-arg OPERATOR_SDK_VERSION=$(OPERATOR_SDK_VERSION)
 
 .PHONY: docker/name/loadtest

diff --git a/dockers/operator/helm/Dockerfile b/dockers/operator/helm/Dockerfile
@@ -18,14 +18,18 @@ ARG VERSION="v1alpha1"
 ARG GROUP="vald.vdaas.org"
 ARG VALD_KIND="ValdRelease"
 ARG VALD_HELM_OPERATOR_KIND="ValdHelmOperatorRelease"
+ARG BASE_TAG=latest
 
-FROM ubuntu:devel AS builder
+FROM vdaas/vald-base:${BASE_TAG} AS builder
 ARG OPERATOR_SDK_VERSION
 ARG VERSION
 ARG GROUP
 ARG VALD_KIND
 ARG VALD_HELM_OPERATOR_KIND
 
+ENV ORG vdaas
+ENV REPO vald
+
 RUN { \
         echo "---"; \
         echo "- version: ${VERSION}"; \
@@ -38,10 +42,33 @@ RUN { \
         echo "  chart: helm-charts/vald-helm-operator"; \
     } > /tmp/watches.yaml
 
+WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/internal
+COPY internal .
+
+WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/versions
+COPY versions .
+
+WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/charts
+COPY charts .
+
+WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/hack
+COPY hack .
+
+WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/Makefile.d
+COPY Makefile.d .
+
+WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}
+COPY Makefile .
+COPY .git .
+
+RUN make helm/schema/vald
+RUN make helm/schema/vald-helm-operator
+RUN cp -r charts /charts
+
 FROM quay.io/operator-framework/helm-operator:${OPERATOR_SDK_VERSION}
 LABEL maintainer "Vald team <vald@vdaas.org>"
 
 COPY --from=builder /tmp/watches.yaml ${HOME}/watches.yaml
 
-COPY charts/vald ${HOME}/helm-charts/vald
-COPY charts/vald-helm-operator ${HOME}/helm-charts/vald-helm-operator
+COPY --from=builder /charts/vald ${HOME}/helm-charts/vald
+COPY --from=builder /charts/vald-helm-operator ${HOME}/helm-charts/vald-helm-operator