Skip to content

Commit 2c61f46

Browse files
Fixed output zip filename for docker build-wheels
1 parent a159262 commit 2c61f46

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

docker/build/Dockerfile

+6-3
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ ARG LIBFRANKA_VERSION
99
RUN /tmp/common/install-dependencies
1010

1111
ARG PYBIN_SUPPORTED_VERSIONS="cp3(7m|8|9|10|11|12)"
12-
# Preserve argument for runtime
13-
ENV PYBIN_SUPPORTED_VERSIONS=${PYBIN_SUPPORTED_VERSIONS}
1412
RUN /tmp/common/manylinux-setup-pip
1513

1614
# Set working directory
@@ -19,9 +17,14 @@ RUN mkdir -p /build
1917
VOLUME /code
2018
VOLUME /build
2119
WORKDIR /build
22-
ADD docker/common/manylinux-build-wheels /usr/bin/manylinux-build-wheels
20+
ADD docker/common/manylinux-build-wheels /usr/bin/
21+
ADD docker/common/dependency_versions /usr/bin/
2322
ADD docker/build/build-wheels /usr/bin/
2423
ADD docker/build/run-tests /usr/bin/
2524

2625
# Cleaning up
2726
RUN rm -rf /tmp/common
27+
28+
# Preserve arguments for runtime
29+
ENV PYBIN_SUPPORTED_VERSIONS=${PYBIN_SUPPORTED_VERSIONS}
30+
ENV LIBFRANKA_VERSION=${LIBFRANKA_VERSION}

docker/common/manylinux-build-wheels

+4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
#!/bin/bash
22
set -e
33

4+
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
5+
. "${SCRIPT_DIR}/dependency_versions"
6+
47
CODE_DIR="${1:-$(pwd)}"
58

69
# Log python versions
@@ -46,4 +49,5 @@ echo "Built the following wheels:"
4649
ls dist
4750

4851
mkdir -p output
52+
LIBFRANKA_VERSION="${LIBFRANKA_VERSION:-${LIBFRANKA_DEFAULT_VERSION}}"
4953
zip -r "output/libfranka_${LIBFRANKA_VERSION//./-}_wheels.zip" dist/

0 commit comments

Comments
 (0)