diff --git a/jenkins/Dockerfile-blossom.ubuntu16 b/jenkins/Dockerfile-blossom.ubuntu16 new file mode 100644 index 000000000000..e26ec22621ce --- /dev/null +++ b/jenkins/Dockerfile-blossom.ubuntu16 @@ -0,0 +1,40 @@ +# +# Copyright (c) 2019-2020, NVIDIA CORPORATION. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License 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. +# + +### +# +# Build the image for rapids-plugin development environment +# +# Arguments: CUDA_VER=10.1 or 10.2 +# +### + +ARG CUDA_VER=10.1 + +FROM nvidia/cuda:${CUDA_VER}-runtime-ubuntu16.04 + +#Install java-8, maven, docker image +RUN apt-get update -y && \ + apt-get install -y software-properties-common +RUN add-apt-repository ppa:deadsnakes/ppa && \ + apt-get update -y && \ + apt-get install -y maven \ + openjdk-8-jdk python3.6 python3-pip tzdata git + +RUN ln -s /usr/bin/python3.6 /usr/bin/python +RUN python -m pip install pytest sre_yield requests + +RUN apt install -y inetutils-ping expect diff --git a/jenkins/Dockerfile.ubuntu16 b/jenkins/Dockerfile.ubuntu16 index e26ec22621ce..2bfdc6067e3a 100644 --- a/jenkins/Dockerfile.ubuntu16 +++ b/jenkins/Dockerfile.ubuntu16 @@ -37,4 +37,5 @@ RUN add-apt-repository ppa:deadsnakes/ppa && \ RUN ln -s /usr/bin/python3.6 /usr/bin/python RUN python -m pip install pytest sre_yield requests -RUN apt install -y inetutils-ping expect +RUN adduser --uid 26576 --gid 30 --shell /bin/bash svcngcc +USER svcngcc diff --git a/jenkins/Jenkinsfile-blossom.premerge b/jenkins/Jenkinsfile-blossom.premerge index 5c78243dff97..9b2295eea451 100644 --- a/jenkins/Jenkinsfile-blossom.premerge +++ b/jenkins/Jenkinsfile-blossom.premerge @@ -168,7 +168,7 @@ pipeline { PREMERGE_TAG = "${IMAGE_TAG}-${BUILD_TAG}" IMAGE_PREMERGE = "${ARTIFACTORY_NAME}/sw-spark-docker-local/plugin:${PREMERGE_TAG}" def CUDA_VER = "$CUDA_NAME" - "cuda" - docker.build(IMAGE_PREMERGE, "-f jenkins/Dockerfile.ubuntu16 --build-arg CUDA_VER=$CUDA_VER --cache-from $CACHE_IMAGE_NAME -t $IMAGE_PREMERGE .") + docker.build(IMAGE_PREMERGE, "-f jenkins/Dockerfile-blossom.ubuntu16 --build-arg CUDA_VER=$CUDA_VER --cache-from $CACHE_IMAGE_NAME -t $IMAGE_PREMERGE .") uploadDocker(IMAGE_PREMERGE) pluginPremerge = pluginPremerge.replace("IMAGE_PREMERGE", "$IMAGE_PREMERGE")