update some dockerfiles to support power (kubeflow#673)

* modify some dockerfile to support power * update more dockerfiles for v2 * modify wrong manager-rest name
mkhaas · Jul 19, 2019 · 97a97fa · 97a97fa
1 parent a30e8e1
commit 97a97fa
Show file tree

Hide file tree

Showing 18 changed files with 110 additions and 20 deletions.
diff --git a/cmd/katib-controller/v1alpha1/Dockerfile b/cmd/katib-controller/v1alpha1/Dockerfile
@@ -6,7 +6,11 @@ ADD . /go/src/github.com/kubeflow/katib
 
 WORKDIR /go/src/github.com/kubeflow/katib/cmd/katib-controller
 # Build
-RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -o studyjobcontroller  ./v1alpha1
+RUN if [ "$(uname -m)" = "ppc64le" ]; then \
+        CGO_ENABLED=0 GOOS=linux GOARCH=ppc64le go build -a -o studyjobcontroller ./v1alpha1; \
+    else \
+        CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -o studyjobcontroller ./v1alpha1; \
+    fi
 # Copy the controller-manager into a thin image
 FROM alpine:3.7
 WORKDIR /app

diff --git a/cmd/katib-controller/v1alpha2/Dockerfile b/cmd/katib-controller/v1alpha2/Dockerfile
@@ -6,7 +6,11 @@ ADD . /go/src/github.com/kubeflow/katib
 
 WORKDIR /go/src/github.com/kubeflow/katib/cmd/katib-controller
 # Build
-RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -o katib-controller  ./v1alpha2
+RUN if [ "$(uname -m)" = "ppc64le" ]; then \
+        CGO_ENABLED=0 GOOS=linux GOARCH=ppc64le go build -a -o katib-controller  ./v1alpha2; \
+    else \
+        CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -o katib-controller  ./v1alpha2; \
+    fi
 # Copy the controller-manager into a thin image
 FROM alpine:3.7
 WORKDIR /app

diff --git a/cmd/manager-rest/v1alpha1/Dockerfile b/cmd/manager-rest/v1alpha1/Dockerfile
@@ -2,7 +2,12 @@ FROM golang:alpine AS build-env
 # The GOPATH in the image is /go.
 ADD . /go/src/github.com/kubeflow/katib
 WORKDIR /go/src/github.com/kubeflow/katib/cmd/manager-rest
-RUN go build -o vizier-manager-rest ./v1alpha1
+RUN if [ "$(uname -m)" = "ppc64le" ]; then \
+        apk --update add gcc musl-dev  && \
+        go build -o vizier-manager-rest ./v1alpha1; \
+    else \
+        go build -o vizier-manager-rest ./v1alpha1; \
+    fi
 
 FROM alpine:3.7
 WORKDIR /app

diff --git a/cmd/manager-rest/v1alpha2/Dockerfile b/cmd/manager-rest/v1alpha2/Dockerfile
@@ -2,7 +2,12 @@ FROM golang:alpine AS build-env
 # The GOPATH in the image is /go.
 ADD . /go/src/github.com/kubeflow/katib
 WORKDIR /go/src/github.com/kubeflow/katib/cmd/manager-rest
-RUN go build -o katib-manager-rest ./v1alpha2
+RUN if [ "$(uname -m)" = "ppc64le" ]; then \
+        apk --update add gcc musl-dev  && \
+        go build -o katib-manager-rest ./v1alpha2; \
+    else \
+        go build -o katib-manager-rest ./v1alpha2; \
+    fi
 
 FROM alpine:3.7
 WORKDIR /app

diff --git a/cmd/manager/v1alpha1/Dockerfile b/cmd/manager/v1alpha1/Dockerfile
@@ -2,13 +2,22 @@ FROM golang:alpine AS build-env
 # The GOPATH in the image is /go.
 ADD . /go/src/github.com/kubeflow/katib
 WORKDIR /go/src/github.com/kubeflow/katib/cmd/manager
-RUN go build -o vizier-manager ./v1alpha1
+RUN if [ "$(uname -m)" = "ppc64le" ]; then \
+        apk --update add git gcc musl-dev && \
+        go build -o vizier-manager ./v1alpha1 && \
+        go get github.com/grpc-ecosystem/grpc-health-probe && \
+        mv $GOPATH/bin/grpc-health-probe /bin/grpc_health_probe && \
+        chmod +x /bin/grpc_health_probe; \
+    else \
+        go build -o vizier-manager ./v1alpha1 && \
+        GRPC_HEALTH_PROBE_VERSION=v0.2.0 && \
+            wget -qO/bin/grpc_health_probe https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/${GRPC_HEALTH_PROBE_VERSION}/grpc_health_probe-linux-amd64 && \
+            chmod +x /bin/grpc_health_probe; \
+    fi
 
 FROM alpine:3.7
 WORKDIR /app
-RUN GRPC_HEALTH_PROBE_VERSION=v0.2.0 && \
-    wget -qO/bin/grpc_health_probe https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/${GRPC_HEALTH_PROBE_VERSION}/grpc_health_probe-linux-amd64 && \
-    chmod +x /bin/grpc_health_probe
+COPY --from=build-env /bin/grpc_health_probe /bin/
 COPY --from=build-env /go/src/github.com/kubeflow/katib/cmd/manager/vizier-manager /app/
 #COPY --from=build-env /go/src/github.com/kubeflow/katib/pkg/manager/v1alpha1/visualise /
 ENTRYPOINT ["./vizier-manager"]

diff --git a/cmd/manager/v1alpha2/Dockerfile b/cmd/manager/v1alpha2/Dockerfile
@@ -2,13 +2,22 @@ FROM golang:alpine AS build-env
 # The GOPATH in the image is /go.
 ADD . /go/src/github.com/kubeflow/katib
 WORKDIR /go/src/github.com/kubeflow/katib/cmd/manager
-RUN go build -o katib-manager ./v1alpha2
+RUN if [ "$(uname -m)" = "ppc64le" ]; then \
+        apk --update add git gcc musl-dev && \
+        go build -o katib-manager ./v1alpha2  && \
+        go get github.com/grpc-ecosystem/grpc-health-probe && \
+        mv $GOPATH/bin/grpc-health-probe /bin/grpc_health_probe && \
+        chmod +x /bin/grpc_health_probe; \
+    else \
+        go build -o katib-manager ./v1alpha2 && \
+        GRPC_HEALTH_PROBE_VERSION=v0.2.0 && \
+            wget -qO/bin/grpc_health_probe https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/${GRPC_HEALTH_PROBE_VERSION}/grpc_health_probe-linux-amd64 && \
+            chmod +x /bin/grpc_health_probe; \
+    fi
 
 FROM alpine:3.7
 WORKDIR /app
-RUN GRPC_HEALTH_PROBE_VERSION=v0.2.0 && \
-    wget -qO/bin/grpc_health_probe https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/${GRPC_HEALTH_PROBE_VERSION}/grpc_health_probe-linux-amd64 && \
-    chmod +x /bin/grpc_health_probe
+COPY --from=build-env /bin/grpc_health_probe /bin/
 COPY --from=build-env /go/src/github.com/kubeflow/katib/cmd/manager/katib-manager /app/
 #COPY --from=build-env /go/src/github.com/kubeflow/katib/pkg/manager/v1alpha1/visualise /
 ENTRYPOINT ["./katib-manager"]

diff --git a/cmd/metricscollector/v1alpha1/Dockerfile b/cmd/metricscollector/v1alpha1/Dockerfile
@@ -7,7 +7,11 @@ ADD . /go/src/github.com/kubeflow/katib
 WORKDIR /go/src/github.com/kubeflow/katib/cmd/metricscollector
 
 # Build
-RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -o metricscollector ./v1alpha1
+RUN if [ "$(uname -m)" = "ppc64le" ]; then \
+        CGO_ENABLED=0 GOOS=linux GOARCH=ppc64le go build -a -o metricscollector ./v1alpha1; \
+    else \
+        CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -o metricscollector ./v1alpha1; \
+    fi
 
 # Copy the controller-manager into a thin image
 FROM alpine:3.7

diff --git a/cmd/metricscollector/v1alpha2/Dockerfile b/cmd/metricscollector/v1alpha2/Dockerfile
@@ -7,7 +7,11 @@ ADD . /go/src/github.com/kubeflow/katib
 WORKDIR /go/src/github.com/kubeflow/katib/cmd/metricscollector
 
 # Build
-RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -o metricscollector ./v1alpha2
+RUN if [ "$(uname -m)" = "ppc64le" ]; then \
+        CGO_ENABLED=0 GOOS=linux GOARCH=ppc64le go build -a -o metricscollector ./v1alpha2; \
+    else \
+        CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -o metricscollector ./v1alpha2; \
+    fi
 
 # Copy the controller-manager into a thin image
 FROM alpine:3.7

diff --git a/cmd/suggestion/bayesianoptimization/v1alpha1/Dockerfile b/cmd/suggestion/bayesianoptimization/v1alpha1/Dockerfile
@@ -2,6 +2,9 @@ FROM python:3
 
 ADD . /usr/src/app/github.com/kubeflow/katib
 WORKDIR /usr/src/app/github.com/kubeflow/katib/cmd/suggestion/bayesianoptimization/v1alpha1
+RUN if [ "$(uname -m)" = "ppc64le" ]; then \
+	apt-get update && apt-get -y install libblas-dev liblapack-dev libatlas-base-dev gfortran; \
+    fi
 RUN pip install --no-cache-dir -r requirements.txt
 ENV PYTHONPATH /usr/src/app/github.com/kubeflow/katib:/usr/src/app/github.com/kubeflow/katib/pkg/api/v1alpha1/python
 

diff --git a/cmd/suggestion/bayesianoptimization/v1alpha2/Dockerfile b/cmd/suggestion/bayesianoptimization/v1alpha2/Dockerfile
@@ -2,6 +2,9 @@ FROM python:3
 
 ADD . /usr/src/app/github.com/kubeflow/katib
 WORKDIR /usr/src/app/github.com/kubeflow/katib/cmd/suggestion/bayesianoptimization/v1alpha2
+RUN if [ "$(uname -m)" = "ppc64le" ]; then \
+	apt-get update && apt-get -y install libblas-dev liblapack-dev libatlas-base-dev gfortran; \
+    fi
 RUN pip install --no-cache-dir -r requirements.txt
 ENV PYTHONPATH /usr/src/app/github.com/kubeflow/katib:/usr/src/app/github.com/kubeflow/katib/pkg/api/v1alpha2/python
 

diff --git a/cmd/suggestion/grid/v1alpha1/Dockerfile b/cmd/suggestion/grid/v1alpha1/Dockerfile
@@ -2,7 +2,12 @@ FROM golang:alpine AS build-env
 # The GOPATH in the image is /go.
 ADD . /go/src/github.com/kubeflow/katib
 WORKDIR /go/src/github.com/kubeflow/katib/cmd/suggestion/grid
-RUN go build -o grid ./v1alpha1
+RUN if [ "$(uname -m)" = "ppc64le" ]; then \
+        apk --update add gcc musl-dev  && \
+        go build -o grid ./v1alpha1; \
+    else \
+        go build -o grid ./v1alpha1; \
+    fi
 
 FROM alpine:3.7
 WORKDIR /app

diff --git a/cmd/suggestion/grid/v1alpha2/Dockerfile b/cmd/suggestion/grid/v1alpha2/Dockerfile
@@ -2,6 +2,11 @@ FROM python:3
 
 ADD . /usr/src/app/github.com/kubeflow/katib
 WORKDIR /usr/src/app/github.com/kubeflow/katib/cmd/suggestion/grid/v1alpha2
+RUN if [ "$(uname -m)" = "ppc64le" ]; then \
+        apt-get -y update && \
+        apt-get -y install gfortran libopenblas-dev liblapack-dev && \
+        pip install cython; \
+    fi
 RUN pip install --no-cache-dir -r requirements.txt
 ENV PYTHONPATH /usr/src/app/github.com/kubeflow/katib:/usr/src/app/github.com/kubeflow/katib/pkg/api/v1alpha2/python
 

diff --git a/cmd/suggestion/hyperband/v1alpha1/Dockerfile b/cmd/suggestion/hyperband/v1alpha1/Dockerfile
@@ -2,7 +2,12 @@ FROM golang:alpine AS build-env
 # The GOPATH in the image is /go.
 ADD . /go/src/github.com/kubeflow/katib
 WORKDIR /go/src/github.com/kubeflow/katib/cmd/suggestion/hyperband
-RUN go build -o hyperband ./v1alpha1
+RUN if [ "$(uname -m)" = "ppc64le" ]; then \
+        apk --update add gcc musl-dev  && \
+	go build -o hyperband ./v1alpha1; \
+    else \
+	go build -o hyperband ./v1alpha1; \
+    fi
 
 FROM alpine:3.7
 WORKDIR /app

diff --git a/cmd/suggestion/hyperband/v1alpha2/Dockerfile b/cmd/suggestion/hyperband/v1alpha2/Dockerfile
@@ -2,6 +2,11 @@ FROM python:3
 
 ADD . /usr/src/app/github.com/kubeflow/katib
 WORKDIR /usr/src/app/github.com/kubeflow/katib/cmd/suggestion/hyperband/v1alpha2
+RUN if [ "$(uname -m)" = "ppc64le" ]; then \
+        apt-get -y update && \
+        apt-get -y install gfortran libopenblas-dev liblapack-dev && \
+        pip install cython; \
+    fi
 RUN pip install --no-cache-dir -r requirements.txt
 ENV PYTHONPATH /usr/src/app/github.com/kubeflow/katib:/usr/src/app/github.com/kubeflow/katib/pkg/api/v1alpha2/python
 

diff --git a/cmd/suggestion/random/v1alpha1/Dockerfile b/cmd/suggestion/random/v1alpha1/Dockerfile
@@ -2,7 +2,12 @@ FROM golang:alpine AS build-env
 # The GOPATH in the image is /go.
 ADD . /go/src/github.com/kubeflow/katib
 WORKDIR /go/src/github.com/kubeflow/katib/cmd/suggestion/random
-RUN go build -o random ./v1alpha1
+RUN if [ "$(uname -m)" = "ppc64le" ]; then \
+        apk --update add gcc musl-dev  && \
+        go build -o random ./v1alpha1; \
+    else \
+        go build -o random ./v1alpha1; \
+    fi
 
 FROM alpine:3.7
 WORKDIR /app

diff --git a/cmd/suggestion/random/v1alpha2/Dockerfile b/cmd/suggestion/random/v1alpha2/Dockerfile
@@ -2,6 +2,11 @@ FROM python:3
 
 ADD . /usr/src/app/github.com/kubeflow/katib
 WORKDIR /usr/src/app/github.com/kubeflow/katib/cmd/suggestion/random/v1alpha2
+RUN if [ "$(uname -m)" = "ppc64le" ]; then \
+        apt-get -y update && \
+        apt-get -y install gfortran libopenblas-dev liblapack-dev && \
+        pip install cython; \
+    fi
 RUN pip install --no-cache-dir -r requirements.txt
 ENV PYTHONPATH /usr/src/app/github.com/kubeflow/katib:/usr/src/app/github.com/kubeflow/katib/pkg/api/v1alpha2/python
 

diff --git a/cmd/ui/v1alpha1/Dockerfile b/cmd/ui/v1alpha1/Dockerfile
@@ -2,7 +2,12 @@ FROM golang:alpine AS build-env
 # The GOPATH in the image is /go.
 ADD . /go/src/github.com/kubeflow/katib
 WORKDIR /go/src/github.com/kubeflow/katib/cmd/ui
-RUN go build -o katib-ui ./v1alpha1
+RUN if [ "$(uname -m)" = "ppc64le" ]; then \
+        apk --update add gcc musl-dev  && \
+	go build -o katib-ui ./v1alpha1; \
+    else \
+	go build -o katib-ui ./v1alpha1; \
+    fi
 
 FROM alpine:3.7
 WORKDIR /app
@@ -11,4 +16,4 @@ COPY --from=build-env /go/src/github.com/kubeflow/katib/cmd/ui/katib-ui /app/
 COPY cmd/ui/v1alpha1/static /app/static
 COPY cmd/ui/v1alpha1/template /app/template
 
-ENTRYPOINT ["./katib-ui"]
+ENTRYPOINT ["./katib-ui"]
diff --git a/cmd/ui/v1alpha2/Dockerfile b/cmd/ui/v1alpha2/Dockerfile
@@ -9,7 +9,12 @@ FROM golang:alpine AS go-build
 # The GOPATH in the image is /go.
 ADD . /go/src/github.com/kubeflow/katib
 WORKDIR /go/src/github.com/kubeflow/katib/cmd/ui
-RUN go build -o katib-ui ./v1alpha2
+RUN if [ "$(uname -m)" = "ppc64le" ]; then \
+        apk --update add gcc musl-dev  && \
+	go build -o katib-ui ./v1alpha2; \
+    else \
+	go build -o katib-ui ./v1alpha2; \
+    fi
 
 FROM alpine:3.7
 WORKDIR /app