From d2dc215658107cc6a8b71b582ad5a04b33f21954 Mon Sep 17 00:00:00 2001 From: DavidKorczynski Date: Mon, 31 Oct 2022 08:26:08 -0400 Subject: [PATCH] oracle-py-cx: fix build (#8895) This is an effort to fix: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=51298 Signed-off-by: David Korczynski Signed-off-by: David Korczynski --- projects/oracle-py-cx/Dockerfile | 12 ++++++------ projects/oracle-py-cx/build.sh | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/projects/oracle-py-cx/Dockerfile b/projects/oracle-py-cx/Dockerfile index 22e2e41a7..8fd49ec6b 100644 --- a/projects/oracle-py-cx/Dockerfile +++ b/projects/oracle-py-cx/Dockerfile @@ -16,8 +16,8 @@ FROM gcr.io/oss-fuzz-base/base-builder-python RUN mkdir -p /opt/oracle -WORKDIR /opt/oracle -RUN wget https://download.oracle.com/otn_software/linux/instantclient/216000/instantclient-basic-linux.x64-21.6.0.0.0dbru.zip && \ +RUN cd /opt/oracle && \ + wget https://download.oracle.com/otn_software/linux/instantclient/216000/instantclient-basic-linux.x64-21.6.0.0.0dbru.zip && \ unzip instantclient-basic-linux.x64-21.6.0.0.0dbru.zip && \ rm instantclient-basic-linux.x64-21.6.0.0.0dbru.zip && \ echo /opt/oracle/instantclient_21_6 > /etc/ld.so.conf.d/oracle-instantclient.conf && \ @@ -27,9 +27,9 @@ ENV LD_LIBRARY_PATH=/opt/oracle/instantclient_21_6 RUN apt-get install libaio1 libaio-dev RUN pip3 install --upgrade pip && pip install requests -RUN git clone https://github.com/oracle/python-cx_Oracle oracle-py-cx -WORKDIR oracle-py-cx -RUN git submodule init && \ - git submodule update +RUN git clone https://github.com/oracle/python-cx_Oracle oracle-py-cx && \ + cd oracle-py-cx && \ + git submodule init && \ + git submodule update COPY build.sh fuzz_*.py $SRC/ diff --git a/projects/oracle-py-cx/build.sh b/projects/oracle-py-cx/build.sh index abf3f88a7..6100ed76f 100644 --- a/projects/oracle-py-cx/build.sh +++ b/projects/oracle-py-cx/build.sh @@ -14,7 +14,7 @@ # limitations under the License. # ################################################################################ - +cd $SRC/oracle-py-cx pip3 install . for fuzzer in $(find $SRC -name 'fuzz_*.py'); do compile_python_fuzzer $fuzzer --add-binary /opt/oracle/instantclient_21_6:./ --add-binary /usr/lib/x86_64-linux-gnu/:./