diff --git a/docker/build/Dockerfile b/docker/build/Dockerfile index e33d37bb..671a1c6b 100644 --- a/docker/build/Dockerfile +++ b/docker/build/Dockerfile @@ -9,8 +9,6 @@ ARG LIBFRANKA_VERSION RUN /tmp/common/install-dependencies ARG PYBIN_SUPPORTED_VERSIONS="cp3(7m|8|9|10|11|12)" -# Preserve argument for runtime -ENV PYBIN_SUPPORTED_VERSIONS=${PYBIN_SUPPORTED_VERSIONS} RUN /tmp/common/manylinux-setup-pip # Set working directory @@ -19,9 +17,14 @@ RUN mkdir -p /build VOLUME /code VOLUME /build WORKDIR /build -ADD docker/common/manylinux-build-wheels /usr/bin/manylinux-build-wheels +ADD docker/common/manylinux-build-wheels /usr/bin/ +ADD docker/common/dependency_versions /usr/bin/ ADD docker/build/build-wheels /usr/bin/ ADD docker/build/run-tests /usr/bin/ # Cleaning up RUN rm -rf /tmp/common + +# Preserve arguments for runtime +ENV PYBIN_SUPPORTED_VERSIONS=${PYBIN_SUPPORTED_VERSIONS} +ENV LIBFRANKA_VERSION=${LIBFRANKA_VERSION} diff --git a/docker/common/manylinux-build-wheels b/docker/common/manylinux-build-wheels index 4d05ba35..e9841b47 100755 --- a/docker/common/manylinux-build-wheels +++ b/docker/common/manylinux-build-wheels @@ -1,6 +1,9 @@ #!/bin/bash set -e +SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +. "${SCRIPT_DIR}/dependency_versions" + CODE_DIR="${1:-$(pwd)}" # Log python versions @@ -46,4 +49,5 @@ echo "Built the following wheels:" ls dist mkdir -p output +LIBFRANKA_VERSION="${LIBFRANKA_VERSION:-${LIBFRANKA_DEFAULT_VERSION}}" zip -r "output/libfranka_${LIBFRANKA_VERSION//./-}_wheels.zip" dist/ \ No newline at end of file