From 0b9605a2b4cbef483c9b219a0ef1acc3071c790e Mon Sep 17 00:00:00 2001 From: Chinmay Shah Date: Thu, 7 May 2020 02:36:56 +0530 Subject: [PATCH 1/2] fix docker build error fixed the file overwrite(duplicate .git file) issue and package name issue. --- Dockerfile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1d535334..05869d32 100644 --- a/Dockerfile +++ b/Dockerfile @@ -38,12 +38,18 @@ RUN git clone https://github.com/google/differential-privacy.git && \ WORKDIR /root/PyDP COPY . /root/PyDP -RUN cp -r /tmp/third_party/* /root/PyDP/third_party +RUN if [[-d "/root/PyDP/third_party/differential-privacy"] && -d "/root/PyDP/third_party/pybind11_bazel"]; \ + then echo ""; \ + else echo "removed" && \ + rm -rf third_party/differential-privacy/ third_party/pybind11_bazel/ && \ + cp -r /tmp/third_party/* /root/PyDP/third_party/ ; \ + fi + RUN \ bash build_PyDP.sh && \ python3 setup.py sdist bdist_wheel && \ - pip install dist/pydp-0.1.0-py2.py3-none-any.whl && \ + pip install dist/*.whl && \ pip install -r requirements_dev.txt # Define default command. From 86ef2794144f96cd3ba58fcb54dc4e7bce98e5cd Mon Sep 17 00:00:00 2001 From: Chinmay Shah Date: Thu, 7 May 2020 23:43:53 +0530 Subject: [PATCH 2/2] fix missing command error --- Dockerfile | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 05869d32..f5af5161 100644 --- a/Dockerfile +++ b/Dockerfile @@ -38,12 +38,8 @@ RUN git clone https://github.com/google/differential-privacy.git && \ WORKDIR /root/PyDP COPY . /root/PyDP -RUN if [[-d "/root/PyDP/third_party/differential-privacy"] && -d "/root/PyDP/third_party/pybind11_bazel"]; \ - then echo ""; \ - else echo "removed" && \ - rm -rf third_party/differential-privacy/ third_party/pybind11_bazel/ && \ - cp -r /tmp/third_party/* /root/PyDP/third_party/ ; \ - fi +RUN rm -rf third_party/differential-privacy/ third_party/pybind11_bazel/ && \ + cp -r /tmp/third_party/* /root/PyDP/third_party RUN \