modify script to build container image

Author: tenzen-y

Makefile

@@ -1,6 +1,7 @@
 HAS_LINT := $(shell command -v golangci-lint;)
 COMMIT := v1beta1-$(shell git rev-parse --short=7 HEAD)
 KATIB_REGISTRY := docker.io/kubeflowkatib
+CPU_ARCH ?= amd64
 
 # Run tests
 .PHONY: test
@@ -49,10 +50,10 @@ endif
 
 # Build images for the Katib v1beta1 components.
 build: generate
-ifeq ($(and $(REGISTRY),$(TAG)),)
-	$(error REGISTRY and TAG must be set. Usage: make build REGISTRY=<registry> TAG=<tag>)
+ifeq ($(and $(REGISTRY),$(TAG),$(CPU_ARCH)),)
+	$(error REGISTRY and TAG must be set. Usage: make build REGISTRY=<registry> TAG=<tag> CPU_ARCH=<cpu-architecture>)
 endif
-	bash scripts/v1beta1/build.sh $(REGISTRY) $(TAG)
+	bash scripts/v1beta1/build.sh $(REGISTRY) $(TAG) $(CPU_ARCH)
 
 # Build and push Katib images from the latest master commit.
 push-latest: generate

cmd/earlystopping/medianstop/v1beta1/Dockerfile

@@ -4,9 +4,10 @@ ENV TARGET_DIR /opt/katib
 ENV EARLY_STOPPING_DIR cmd/earlystopping/medianstop/v1beta1
 
 RUN if [ "$(uname -m)" = "ppc64le" ] || [ "$(uname -m)" = "aarch64" ]; then \
-  apt-get -y update && \
-  apt-get -y install gfortran libopenblas-dev liblapack-dev && \
-  pip install cython; \
+    apt-get -y update && \
+    apt-get -y install gfortran libopenblas-dev liblapack-dev && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*; \
   fi
 
 ADD ./pkg/ ${TARGET_DIR}/pkg/

cmd/earlystopping/medianstop/v1beta1/requirements.txt

@@ -2,3 +2,4 @@ grpcio==1.41.1
 protobuf==3.19.1
 googleapis-common-protos==1.6.0
 kubernetes==11.0.0
+cython>=0.29.24

cmd/metricscollector/v1beta1/tfevent-metricscollector/requirements.txt

@@ -1,4 +1,4 @@
 psutil==5.6.6
-rfc3339
-grpcio
-googleapis-common-protos
+rfc3339>=6.2
+grpcio==1.41.1
+googleapis-common-protos==1.6.0

cmd/new-ui/v1beta1/Dockerfile.ppc64le

@@ -0,0 +1,63 @@
+# --- Clone the kubeflow/kubeflow code ---
+FROM ubuntu AS fetch-kubeflow-kubeflow
+
+RUN apt-get update && apt-get install git -y
+
+WORKDIR /kf
+RUN git clone https://github.com/kubeflow/kubeflow.git && \
+    cd kubeflow && \
+    git checkout 24bcb8e
+
+# --- Build the frontend kubeflow library ---
+FROM ppc64le/node:12 AS frontend-kubeflow-lib
+
+WORKDIR /src
+
+ARG LIB=/kf/kubeflow/components/crud-web-apps/common/frontend/kubeflow-common-lib
+COPY --from=fetch-kubeflow-kubeflow $LIB/package*.json ./
+RUN npm ci
+
+COPY --from=fetch-kubeflow-kubeflow $LIB/ ./
+RUN npm run build
+
+# --- Build the frontend ---
+FROM ppc64le/node:12 AS frontend
+
+WORKDIR /src
+COPY ./pkg/new-ui/v1beta1/frontend/package*.json ./
+RUN npm ci
+
+COPY ./pkg/new-ui/v1beta1/frontend/ .
+COPY --from=frontend-kubeflow-lib /src/dist/kubeflow/ ./node_modules/kubeflow/
+
+RUN npm run build:prod
+
+# --- Build the backend ---
+FROM golang:alpine AS go-build
+
+WORKDIR /go/src/github.com/kubeflow/katib
+
+# Download packages.
+COPY go.mod .
+COPY go.sum .
+RUN go mod download -x
+
+# Copy sources.
+COPY cmd/ cmd/
+COPY pkg/ pkg/
+
+# Build the binary.
+RUN if [ "$(uname -m)" = "ppc64le" ]; then \
+    CGO_ENABLED=0 GOOS=linux GOARCH=ppc64le go build -a -o katib-ui  ./cmd/new-ui/v1beta1; \
+    elif [ "$(uname -m)" = "aarch64" ]; then \
+    CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -a -o katib-ui  ./cmd/new-ui/v1beta1; \
+    else \
+    CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -o katib-ui  ./cmd/new-ui/v1beta1; \
+    fi
+
+# --- Compose the web app ---
+FROM alpine:3.7
+WORKDIR /app
+COPY --from=go-build /go/src/github.com/kubeflow/katib/katib-ui /app/
+COPY --from=frontend /src/dist/static /app/build/static/
+ENTRYPOINT ["./katib-ui"]

cmd/suggestion/chocolate/v1beta1/Dockerfile

@@ -8,8 +8,7 @@ RUN if [ "$(uname -m)" = "ppc64le" ] || [ "$(uname -m)" = "aarch64" ]; then \
     apt-get -y update && \
     apt-get -y install gfortran libopenblas-dev liblapack-dev && \
     apt-get clean && \
-    rm -rf /var/lib/apt/lists/* && \
-    pip install cython; \
+    rm -rf /var/lib/apt/lists/*; \
     fi
 RUN if [ "$(uname -m)" = "ppc64le" ]; then \
     wget -qO/bin/grpc_health_probe https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/${GRPC_HEALTH_PROBE_VERSION}/grpc_health_probe-linux-ppc64le; \
@@ -23,6 +22,9 @@ RUN if [ "$(uname -m)" = "ppc64le" ]; then \
 ADD ./pkg/ ${TARGET_DIR}/pkg/
 ADD ./${SUGGESTION_DIR}/ ${TARGET_DIR}/${SUGGESTION_DIR}/
 WORKDIR  ${TARGET_DIR}/${SUGGESTION_DIR}
+RUN if [ "$(uname -m)" = "aarch64" ]; then \
+    sed -i -e '$a git+https://github.com/fmder/ghalton@master' -e '/^ghalton/d' requirements.txt; \
+    fi;
 RUN pip install --no-cache-dir -r requirements.txt
 
 RUN chgrp -R 0 ${TARGET_DIR} \

cmd/suggestion/chocolate/v1beta1/requirements.txt

@@ -9,3 +9,4 @@ googleapis-common-protos==1.6.0
 SQLAlchemy==1.4.26
 git+https://github.com/AIworx-Labs/chocolate@master
 ghalton>=0.6.2
+cython>=0.29.24

cmd/suggestion/hyperband/v1beta1/Dockerfile

@@ -8,8 +8,7 @@ RUN if [ "$(uname -m)" = "ppc64le" ] || [ "$(uname -m)" = "aarch64" ]; then \
     apt-get -y update && \
     apt-get -y install gfortran libopenblas-dev liblapack-dev && \
     apt-get clean && \
-    rm -rf /var/lib/apt/lists/* && \
-    pip install cython; \
+    rm -rf /var/lib/apt/lists/*; \
     fi
 
 RUN if [ "$(uname -m)" = "ppc64le" ]; then \

cmd/suggestion/hyperband/v1beta1/requirements.txt

@@ -6,3 +6,4 @@ scipy>=1.5.4
 forestci==0.3
 protobuf==3.19.1
 googleapis-common-protos==1.6.0
+cython>=0.29.24

cmd/suggestion/hyperopt/v1beta1/Dockerfile

@@ -8,8 +8,7 @@ RUN if [ "$(uname -m)" = "ppc64le" ] || [ "$(uname -m)" = "aarch64" ]; then \
     apt-get -y update && \
     apt-get -y install gfortran libopenblas-dev liblapack-dev && \
     apt-get clean && \
-    rm -rf /var/lib/apt/lists/* && \
-    pip install cython; \
+    rm -rf /var/lib/apt/lists/*; \
     fi
 
 RUN if [ "$(uname -m)" = "ppc64le" ]; then \