Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/python_lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
python-lint:

runs-on: ubuntu-18.04
container: seldonio/python-builder:0.4
container: seldonio/python-builder:0.5

steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/python_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
python-tests:

runs-on: ubuntu-18.04
container: seldonio/python-builder:0.4
container: seldonio/python-builder:0.5

steps:
- uses: actions/checkout@v2
Expand Down
18 changes: 17 additions & 1 deletion ci_build_and_push_images.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,25 @@ if [[ $CORE_BUILDER_MODIFIED -gt 0 ]]; then
return 1
fi
else
echo "SKIPPING PREPACKAGED IMAGE BUILD..."
echo "SKIPPING CORE BUILDER IMAGE BUILD..."
CORE_BUILDER_EXIT_VALUE=0
fi

echo "Files changed in python builder folder:"
git --no-pager diff --exit-code --name-only origin/master python-builder/
PYTHON_BUILDER_MODIFIED=$?
if [[ $PYTHON_BUILDER_MODIFIED -gt 0 ]]; then
make -C python-builder/ build_docker_image push_to_registry
PYTHON_BUILDER_EXIT_VALUE=$?
if [[ $PYTHON_BUILDER_EXIT_VALUE -gt 0 ]]; then
echo "Prepackaged server build returned errors"
return 1
fi
else
echo "SKIPPING PYTHON BUILDER IMAGE BUILD..."
PYTHON_BUILDER_EXIT_VALUE=0
fi

###########################################################
### Images that need build every time

Expand Down Expand Up @@ -236,4 +251,5 @@ exit $((${PYTHON_EXIT_VALUE} \
+ ${RCLONE_STORAGE_INITIALIZER_EXIT_VALUE} \
+ ${MAB_EXIT_VALUE} \
+ ${CORE_BUILDER_EXIT_VALUE} \
+ ${PYTHON_BUILDER_EXIT_VALUE} \
+ ${EXPLAIN_EXIT_VALUE}))
6 changes: 6 additions & 0 deletions python-builder/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,12 @@ RUN unzip git.zip
RUN apt-get remove git -y
RUN make prefix=/usr/local -C git-2.30.0/ all install


# This is to install desired version of Python without updating conda version
ENV PYTHON_VERSION "3.7.10"
ENV CONDA_VERSION "4.7.12"
RUN conda install --yes python=$PYTHON_VERSION conda=$CONDA_VERSION

# Installs required
RUN apt-get install curl

Expand Down
2 changes: 1 addition & 1 deletion python-builder/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
DOCKER_IMAGE_NAME=seldonio/python-builder
DOCKER_IMAGE_VERSION=0.4
DOCKER_IMAGE_VERSION=0.5

build_docker_image:
docker build --force-rm=true -t $(DOCKER_IMAGE_NAME):$(DOCKER_IMAGE_VERSION) .
Expand Down