summaryrefslogtreecommitdiff
path: root/docker/pip
diff options
context:
space:
mode:
authorjwijenbergh <jeroenwijenbergh@protonmail.com>2024-06-05 14:28:32 +0200
committerjwijenbergh <jeroenwijenbergh@protonmail.com>2024-06-05 14:28:32 +0200
commit5aefaa1a88a0afdda6a8103587a1761e14b72aff (patch)
tree8f793783a9c4a018cda398691e608f75ca771c85 /docker/pip
parent3d47c63005ad962951080370a647914ab7c34e94 (diff)
Docker pip: Update for new building
Diffstat (limited to 'docker/pip')
-rw-r--r--docker/pip/amd64.dockerfile6
-rw-r--r--docker/pip/arm64.dockerfile6
2 files changed, 8 insertions, 4 deletions
diff --git a/docker/pip/amd64.dockerfile b/docker/pip/amd64.dockerfile
index 27bbb8b..572fdd3 100644
--- a/docker/pip/amd64.dockerfile
+++ b/docker/pip/amd64.dockerfile
@@ -15,9 +15,11 @@ RUN CGO_ENABLED=1 go build -buildvcs=false -o lib/linux/amd64/libeduvpn_common-$
WORKDIR /pip/eduvpn-common-$COMMONVERSION/wrappers/python
-RUN ./setup.py bdist_wheel --exports-lib-path="../../lib"
+RUN python3 -m pip install build
+RUN install ../../lib/linux/amd64/libeduvpn_common-$COMMONVERSION.so -Dt eduvpn_common/lib
+RUN python3 -m build --sdist --wheel .
-RUN auditwheel repair dist/*
+RUN auditwheel repair dist/*.whl
RUN mkdir /wheelhouse
RUN cp -r wheelhouse/* /wheelhouse \ No newline at end of file
diff --git a/docker/pip/arm64.dockerfile b/docker/pip/arm64.dockerfile
index 47a832b..cdd822c 100644
--- a/docker/pip/arm64.dockerfile
+++ b/docker/pip/arm64.dockerfile
@@ -15,9 +15,11 @@ RUN CGO_ENABLED=1 go build -buildvcs=false -o lib/linux/arm64/libeduvpn_common-$
WORKDIR /pip/eduvpn-common-$COMMONVERSION/wrappers/python
-RUN ./setup.py bdist_wheel --exports-lib-path="../../lib"
+RUN python3 -m pip install build
+RUN install ../../lib/linux/arm64/libeduvpn_common-$COMMONVERSION.so -Dt eduvpn_common/lib
+RUN python3 -m build --sdist --wheel .
-RUN auditwheel repair dist/*
+RUN auditwheel repair dist/*.whl
RUN mkdir /wheelhouse
RUN cp -r wheelhouse/* /wheelhouse \ No newline at end of file