Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

vdk-core: Allow different python versions for vdk docker images #2346

Merged
merged 1 commit into from
Jul 7, 2023
Merged

vdk-core: Allow different python versions for vdk docker images #2346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion projects/vdk-core/cicd/Dockerfile-vdk-base
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
# Specifies a base image containing installed and ready to use VDK
# https://docs.docker.com/develop/develop-images/dockerfile_best-practices

FROM python:3.7-slim
ARG vdk_base_python_image

FROM $vdk_base_python_image

WORKDIR /vdk

Expand Down
2 changes: 2 additions & 0 deletions projects/vdk-core/cicd/deploy-base-vdk-image.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ export VDK_PACKAGE=${VDK_PACKAGE:-$(python setup.py --name)}
export VDK_DOCKER_REGISTRY_URL=${VDK_DOCKER_REGISTRY_URL:-"registry.hub.docker.com/versatiledatakit"}
export DOCKER_REGISTRY_IMAGE=${DOCKER_REGISTRY_IMAGE:-"$VDK_DOCKER_REGISTRY_URL/$VDK_PACKAGE"} # where the image should be pushed
export PIP_EXTRA_INDEX_URL=${PIP_EXTRA_INDEX_URL:-https://test.pypi.org/simple/}
export VDK_BASE_PYTHON_IMAGE=${VDK_BASE_PYTHON_IMAGE:-python:3.7-slim}

set -o errexit -o nounset

Expand Down Expand Up @@ -47,6 +48,7 @@ docker build -t "${DOCKER_REGISTRY_IMAGE}:${BUILD_TYPE}" -t "${DOCKER_REGISTRY_
--build-arg vdk_package="${VDK_PACKAGE}" \
--build-arg vdk_version="${VDK_VERSION}" \
--build-arg pip_extra_index_url="${PIP_EXTRA_INDEX_URL}" \
--build-arg vdk_base_python_image="${VDK_BASE_PYTHON_IMAGE}" \
.

# docker registry must allow override
Expand Down