diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 0e8afa74ae..1ad77ec8ef 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -10,7 +10,7 @@ jobs: docs-lint: runs-on: ubuntu-latest - container: seldonio/core-builder:0.27 + container: seldonio/core-builder:0.30 steps: - uses: actions/checkout@v2 @@ -21,7 +21,7 @@ jobs: docs-build: runs-on: ubuntu-latest - container: seldonio/core-builder:0.27 + container: seldonio/core-builder:0.30 steps: - uses: actions/checkout@v2 diff --git a/.lighthouse/jenkins-x/benchmark.yaml b/.lighthouse/jenkins-x/benchmark.yaml index ceade0e572..67fd2a8649 100644 --- a/.lighthouse/jenkins-x/benchmark.yaml +++ b/.lighthouse/jenkins-x/benchmark.yaml @@ -15,7 +15,7 @@ spec: - image: uses:jenkins-x/jx3-pipeline-catalog/tasks/git-clone/git-clone-pr.yaml@versionStream name: "" - name: benchmark-step - image: seldonio/core-builder:0.27 + image: seldonio/core-builder:0.30 env: - name: SELDON_E2E_TESTS_TO_RUN value: benchmark diff --git a/.lighthouse/jenkins-x/integration.yaml b/.lighthouse/jenkins-x/integration.yaml index d0b1dda581..6db753c14d 100644 --- a/.lighthouse/jenkins-x/integration.yaml +++ b/.lighthouse/jenkins-x/integration.yaml @@ -15,7 +15,7 @@ spec: - image: uses:jenkins-x/jx3-pipeline-catalog/tasks/git-clone/git-clone-pr.yaml@versionStream name: "" - name: integration-step - image: seldonio/core-builder:0.29 + image: seldonio/core-builder:0.30 env: - name: DOCKER_BUILDKIT value: "0" diff --git a/.lighthouse/jenkins-x/models.yaml b/.lighthouse/jenkins-x/models.yaml index 62ec727868..5e462c4117 100644 --- a/.lighthouse/jenkins-x/models.yaml +++ b/.lighthouse/jenkins-x/models.yaml @@ -15,7 +15,7 @@ spec: - image: uses:jenkins-x/jx3-pipeline-catalog/tasks/git-clone/git-clone-pr.yaml@versionStream name: "" - name: models-step - image: seldonio/core-builder:0.27 + image: seldonio/core-builder:0.30 command: - bash - -c diff --git a/.lighthouse/jenkins-x/notebooks.yaml b/.lighthouse/jenkins-x/notebooks.yaml index 0e10fd5c6d..b15e1676e9 100644 --- a/.lighthouse/jenkins-x/notebooks.yaml +++ b/.lighthouse/jenkins-x/notebooks.yaml @@ -15,7 +15,7 @@ spec: - image: uses:jenkins-x/jx3-pipeline-catalog/tasks/git-clone/git-clone-pr.yaml@versionStream name: "" - name: notebooks-step - image: seldonio/core-builder:0.29 + image: seldonio/core-builder:0.30 env: - name: DOCKER_BUILDKIT value: "0" diff --git a/.lighthouse/jenkins-x/release.yaml b/.lighthouse/jenkins-x/release.yaml index e05974aede..a4a7091e3a 100644 --- a/.lighthouse/jenkins-x/release.yaml +++ b/.lighthouse/jenkins-x/release.yaml @@ -15,7 +15,7 @@ spec: - image: uses:jenkins-x/jx3-pipeline-catalog/tasks/git-clone/git-clone-pr.yaml@versionStream name: "" - name: release-step - image: seldonio/core-builder:0.27 + image: seldonio/core-builder:0.30 env: - name: DOCKER_BUILDKIT value: "0" diff --git a/core-builder/Dockerfile b/core-builder/Dockerfile index 7d0c0ab618..895f4581d5 100644 --- a/core-builder/Dockerfile +++ b/core-builder/Dockerfile @@ -1,6 +1,6 @@ FROM openjdk:13.0.1-jdk-buster -ENV PYTHON_VERSION "3.7.11" +ENV PYTHON_VERSION "3.8.10" # install docker RUN \ @@ -45,10 +45,10 @@ RUN \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* # Install maven -ENV MAVEN_VERSION=3.6.3 +ENV MAVEN_VERSION=3.9.3 ENV USER_HOME_DIR="/root" -ENV SHA=c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0 -ENV BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries +ENV SHA=400fc5b6d000c158d5ee7937543faa06b6bda8408caa2444a9c947c21472fde0f0b64ac452b8cec8855d528c0335522ed5b6c8f77085811c7e29e1bedbb5daa2 +ENV BASE_URL=https://dlcdn.apache.org/maven/maven-3/${MAVEN_VERSION}/binaries RUN mkdir -p /usr/share/maven /usr/share/maven/ref \ && curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz \ && echo "${SHA} /tmp/apache-maven.tar.gz" | sha512sum -c - \ @@ -67,17 +67,18 @@ RUN apt-get upgrade && \ apt-get install libbz2-dev -y && \ apt-get install liblzma-dev -y -ENV CONDA_VERSION "4.7.12" -RUN wget --quiet https://repo.anaconda.com/miniconda/Miniconda3-$CONDA_VERSION-Linux-x86_64.sh -O ~/miniconda.sh && \ +ENV CONDA_DOWNLOAD_VERSION="py38_23.3.1-0" +ENV CONDA_VERSION "23.5.0" +RUN wget --quiet https://repo.anaconda.com/miniconda/Miniconda3-${CONDA_DOWNLOAD_VERSION}-Linux-x86_64.sh -O ~/miniconda.sh && \ /bin/bash ~/miniconda.sh -b -p /opt/conda && \ rm ~/miniconda.sh && \ - /opt/conda/bin/conda clean -tipsy && \ + /opt/conda/bin/conda clean -tipy && \ ln -s /opt/conda/etc/profile.d/conda.sh /etc/profile.d/conda.sh && \ echo ". /opt/conda/etc/profile.d/conda.sh" >> ~/.bashrc && \ echo "conda activate base" >> ~/.bashrc && \ chgrp -R root /opt/conda && chmod -R g+rw /opt/conda ENV PATH="/opt/conda/bin:${PATH}" -ENV PYTHON_VERSION "3.7.10" +ENV PYTHON_VERSION "3.8.10" # This is to install desired version of Python without updating conda version RUN conda install --yes python=$PYTHON_VERSION conda=$CONDA_VERSION diff --git a/core-builder/Makefile b/core-builder/Makefile index a317d3e425..d5a2590e4f 100644 --- a/core-builder/Makefile +++ b/core-builder/Makefile @@ -1,5 +1,5 @@ DOCKER_IMAGE_NAME=seldonio/core-builder -DOCKER_IMAGE_VERSION=0.29 +DOCKER_IMAGE_VERSION=0.30 build_docker_image: cp ../testing/scripts/dev_requirements.txt . diff --git a/testing/scripts/dev_requirements.txt b/testing/scripts/dev_requirements.txt index cabb8db31f..e4bf298ca6 100644 --- a/testing/scripts/dev_requirements.txt +++ b/testing/scripts/dev_requirements.txt @@ -8,10 +8,10 @@ sh==1.13.1 # notebooks test deps ipython==7.13.0 nbconvert==5.6.1 -alibi==0.5.2 -shap==0.35.0 +alibi==0.9.2 +shap==0.40.0 matplotlib==3.1.3 -tensorflow==2.4.0 +tensorflow==2.12.1 tabulate==0.8.7 Jinja2==3.0.0 @@ -19,4 +19,4 @@ Jinja2==3.0.0 coverage==4.5.4 # Required to build mock test images -mlserver==1.1.0 +mlserver==1.3.5