From 04bf7f9bb851ed7f2d35f46e2f4686bcab9ae7b4 Mon Sep 17 00:00:00 2001 From: tke Date: Fri, 21 Dec 2018 11:45:17 +0100 Subject: [PATCH] fixed order of peepdf.dockerfile moved some parts around for better rebuilds --- dockerfiles/peepdf.dockerfile | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/dockerfiles/peepdf.dockerfile b/dockerfiles/peepdf.dockerfile index 48cf5b6..d94676a 100644 --- a/dockerfiles/peepdf.dockerfile +++ b/dockerfiles/peepdf.dockerfile @@ -7,15 +7,6 @@ RUN apt-get update && apt-get install -y git && rm -rf /var/lib/apt/lists/* RUN git clone https://github.com/jesparza/peepdf /opt/peepdf RUN git clone https://github.com/DidierStevens/DidierStevensSuite /opt/didierstevenssuite - -RUN groupadd -g 1001 -r nonroot && \ - useradd -u 1001 -r -g nonroot -d /home/nonroot -s /sbin/nologin -c "Nonroot User" nonroot && \ - mkdir /home/nonroot && \ - chown -R nonroot:nonroot /home/nonroot - -WORKDIR /home/nonroot/ - - RUN apt-get update && apt-get install -y \ python3-lxml \ libemu2 \ @@ -34,13 +25,19 @@ RUN git clone https://github.com/buffer/pyv8.git ; cd pyv8 ; python setup.py bui RUN git clone https://github.com/buffer/libemu.git ; cd libemu ; autoreconf -v -i && ./configure --prefix=/opt/libemu && make install && cd .. && rm -rf libemu2 RUN pip install pylibemu -RUN chmod +x /opt/didierstevenssuite/* +RUN chmod +x /opt/didierstevenssuite/*py RUN ln -s /opt/peepdf/peepdf.py /bin/peepdf.py RUN chmod +x /bin/peepdf.py ENV PATH="/opt/didierstevenssuite/:${PATH}" -#USER nonroot +RUN groupadd -g 1001 -r nonroot && \ +useradd -u 1001 -r -g nonroot -d /home/nonroot -s /sbin/nologin -c "Nonroot User" nonroot && \ +mkdir /home/nonroot && \ +chown -R nonroot:nonroot /home/nonroot + +WORKDIR /home/nonroot/ +USER nonroot WORKDIR /home/nonroot/ CMD /bin/bash