Update openblas images (#5082)

Signed-off-by: quicksilver <zhifeng.zhang@zilliz.com>
2021-04-29 11:28:27 +08:00 · 2021-04-29 11:28:27 +08:00 · 7a188a8ae5
parent a042090b86
commit 7a188a8ae5
8 changed files with 27 additions and 47 deletions
--- a/.env
+++ b/.env
@ -1,8 +1,8 @@
-REPO=milvusdb/milvus-dev
-ARCH=amd64
+IMAGE_REPO=milvusdb
+IMAGE_ARCH=amd64
 UBUNTU=18.04
-DATE_VERSION=20210426-055946
-LATEST_DATE_VERSION=20210426-055946
+DATE_VERSION=20210428-144501
+LATEST_DATE_VERSION=20210428-144501
 MINIO_ADDRESS=minio:9000
 PULSAR_ADDRESS=pulsar://pulsar:6650
 ETCD_ADDRESS=etcd:2379
--- a/build/builder.sh
+++ b/build/builder.sh
@ -7,26 +7,13 @@ toplevel=$(dirname "$(cd "$(dirname "${0}")"; pwd)")

 pushd "${toplevel}"

-if [ "${1-}" = "pull" ]; then
+if [[ "${1-}" == "pull" ]]; then
    docker-compose pull --ignore-pull-failures ubuntu
    # docker-compose pull --ignore-pull-failures gdbserver
    exit 0
 fi

-# if [ "${1-}" = "gdbserver" ]; then
-#     mkdir -p "${DOCKER_VOLUME_DIRECTORY:-.docker}/amd64-ubuntu18.04-gdbserver-home"
-#     chmod -R 777 "${DOCKER_VOLUME_DIRECTORY:-.docker}"
-#
-#     docker-compose pull --ignore-pull-failures gdbserver
-#     if [ "${CHECK_BUILDER:-}" == "1" ]; then
-#         DATE_VERSION=latest docker-compose pull --ignore-pull-failures gdbserver
-#         docker-compose build gdbserver
-#     fi
-#     docker-compose up -d gdbserver
-#     exit 0
-# fi
-
-if [ "${1-}" = "down" ]; then
+if [[ "${1-}" == "down" ]]; then
    docker-compose down
    exit 0
 fi
@ -49,10 +36,15 @@ mkdir -p "${DOCKER_VOLUME_DIRECTORY:-.docker}/amd64-ubuntu18.04-go-mod"
 chmod -R 777 "${DOCKER_VOLUME_DIRECTORY:-.docker}"

 docker-compose pull --ignore-pull-failures ubuntu
-if [ "${CHECK_BUILDER:-}" == "1" ]; then
+if [[ "${CHECK_BUILDER:-}" == "1" ]]; then
    DATE_VERSION=latest docker-compose pull --ignore-pull-failures ubuntu
    docker-compose build ubuntu
 fi
-docker-compose run --rm -u "$uid:$gid" ubuntu "$@"
+
+if [[ "$(id -u)" != "0" ]]; then
+    docker-compose run --rm -u "$uid:$gid" ubuntu "$@"
+else
+    docker-compose run --rm --entrypoint "/tini --" ubuntu "$@"
+fi

 popd
--- a/build/docker/builder/cpu/ubuntu18.04/Dockerfile
+++ b/build/docker/builder/cpu/ubuntu18.04/Dockerfile
@ -9,13 +9,7 @@
 # is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
 # or implied. See the License for the specific language governing permissions and limitations under the License.

-FROM ubuntu:bionic-20200921
-
-# pipefail is enabled for proper error detection in the `wget | apt-key add`
-# step
-SHELL ["/bin/bash", "-o", "pipefail", "-c"]
-
-ENV DEBIAN_FRONTEND noninteractive
+FROM milvusdb/openblas:ubuntu18.04-20210428

 RUN apt-get update && apt-get install -y --no-install-recommends wget curl ca-certificates gnupg2 && \
    wget -qO- "https://cmake.org/files/v3.14/cmake-3.14.3-Linux-x86_64.tar.gz" | tar --strip-components=1 -xz -C /usr/local && \
@ -24,14 +18,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends wget curl ca-ce
    apt-get remove --purge -y && \
    rm -rf /var/lib/apt/lists/*

-# Install OpenBlas Library
-RUN wget https://github.com/xianyi/OpenBLAS/archive/v0.3.9.tar.gz && \
-    tar zxvf v0.3.9.tar.gz && cd OpenBLAS-0.3.9 && \
-    make TARGET=CORE2 DYNAMIC_ARCH=1 DYNAMIC_OLDER=1 USE_THREAD=0 USE_OPENMP=0 FC=gfortran CC=gcc COMMON_OPT="-O3 -g -fPIC" FCOMMON_OPT="-O3 -g -fPIC -frecursive" NMAX="NUM_THREADS=128" LIBPREFIX="libopenblas" LAPACKE="NO_LAPACKE=1" INTERFACE64=0 NO_STATIC=1 && \
-    make PREFIX=/usr NO_STATIC=1 install && \
-    cd .. && rm -rf OpenBLAS-0.3.9 && rm v0.3.9.tar.gz
-ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/lib"
-
 # Install Go
 ENV GOPATH /go
 ENV GOROOT /usr/local/go
--- a/build/docker/milvus/Dockerfile
+++ b/build/docker/milvus/Dockerfile
@ -9,7 +9,7 @@
 # is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
 # or implied. See the License for the specific language governing permissions and limitations under the License.

-FROM milvusdb/openblas:ubuntu18.04-20210417 AS openblas
+FROM milvusdb/openblas:ubuntu18.04-20210428 AS openblas

 #FROM alpine
 FROM ubuntu:bionic-20200921
--- a/build/docker/openblas/Dockerfile
+++ b/build/docker/openblas/Dockerfile
@ -7,7 +7,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 ENV DEBIAN_FRONTEND noninteractive

 RUN apt-get update && apt-get install -y --no-install-recommends wget ca-certificates gnupg2 && \
-    g++ gcc gfortran git make && \
+    apt-get update && apt-get install -y --no-install-recommends g++ gcc gfortran git make && \
    apt-get remove --purge -y && \
    rm -rf /var/lib/apt/lists/* && \
    wget https://github.com/xianyi/OpenBLAS/archive/v0.3.9.tar.gz && \
@ -15,3 +15,5 @@ RUN apt-get update && apt-get install -y --no-install-recommends wget ca-certifi
    make TARGET=CORE2 DYNAMIC_ARCH=1 DYNAMIC_OLDER=1 USE_THREAD=0 USE_OPENMP=0 FC=gfortran CC=gcc COMMON_OPT="-O3 -g -fPIC" FCOMMON_OPT="-O3 -g -fPIC -frecursive" NMAX="NUM_THREADS=128" LIBPREFIX="libopenblas" LAPACKE="NO_LAPACKE=1" INTERFACE64=0 NO_STATIC=1 && \
    make -j4 PREFIX=/usr NO_STATIC=1 install && \
    cd .. && rm -rf OpenBLAS-0.3.9 && rm v0.3.9.tar.gz
+
+ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/lib"
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -9,13 +9,13 @@ x-ccache: &ccache

 services:
  ubuntu:
-    image: ${REPO}:${ARCH}-ubuntu${UBUNTU}-${DATE_VERSION}
+    image: ${IMAGE_REPO}/milvus-dev:${IMAGE_ARCH}-ubuntu${UBUNTU}-${DATE_VERSION}
    # Build devcontainer
    build:
      context: .
      dockerfile: build/docker/builder/cpu/ubuntu${UBUNTU}/Dockerfile
      cache_from:
-        - ${REPO}:${ARCH}-ubuntu${UBUNTU}-${LATEST_DATE_VERSION}
+        - ${IMAGE_REPO}/milvus-dev:${IMAGE_ARCH}-ubuntu${UBUNTU}-${LATEST_DATE_VERSION}
    # user: {{ CURRENT_ID }}
    shm_size: 2G
    environment:
@ -25,9 +25,9 @@ services:
      MINIO_ADDRESS: ${MINIO_ADDRESS}
    volumes: &ubuntu-volumes
      - .:/go/src/github.com/milvus-io/milvus:delegated
-      - ${DOCKER_VOLUME_DIRECTORY:-.docker}/${ARCH}-ubuntu${UBUNTU}-ccache:/ccache:delegated
-      - ${DOCKER_VOLUME_DIRECTORY:-.docker}/${ARCH}-ubuntu${UBUNTU}-go-mod:/go/pkg/mod:delegated
-      - ${DOCKER_VOLUME_DIRECTORY:-.docker}/${ARCH}-ubuntu${UBUNTU}-vscode-extensions:/home/milvus/.vscode-server/extensions:delegated
+      - ${DOCKER_VOLUME_DIRECTORY:-.docker}/${IMAGE_ARCH}-ubuntu${UBUNTU}-ccache:/ccache:delegated
+      - ${DOCKER_VOLUME_DIRECTORY:-.docker}/${IMAGE_ARCH}-ubuntu${UBUNTU}-go-mod:/go/pkg/mod:delegated
+      - ${DOCKER_VOLUME_DIRECTORY:-.docker}/${IMAGE_ARCH}-ubuntu${UBUNTU}-vscode-extensions:/home/milvus/.vscode-server/extensions:delegated
    working_dir: "/go/src/github.com/milvus-io/milvus"
    # Command
    command: &ubuntu-command >
--- a/tests/docker/.env
+++ b/tests/docker/.env
@ -1,5 +1,5 @@
 SERVICE_IP=127.0.0.1
 SERVICE_PORT=19530
-REPO=milvusdb/pytest
-TAG=20210331-546c8df
+IMAGE_REPO=milvusdb
+IMAGE_TAG=20210331-546c8df
 PRE_EXIST_NETWORK=bridge
--- a/tests/docker/docker-compose.yml
+++ b/tests/docker/docker-compose.yml
@ -2,12 +2,12 @@ version: '3.5'

 services:
  pytest:
-    image: ${REPO}:${TAG}
+    image: ${IMAGE_REPO}/pytest:${IMAGE_TAG}
    build:
      context: ..
      dockerfile: ./docker/Dockerfile
      cache_from:
-        - ${REPO}:latest
+        - ${IMAGE_REPO}/pytest:latest
    shm_size: 2G
    environment:
      SERVICE_IP: ${SERVICE_IP}