WIP: Simplify Dockerfile

Dockerfile

@@ -1,31 +1,28 @@
 FROM debian:latest
 
-RUN apt-get update && apt-get install -y  gcc \
-					make \
-					vim \ 
-					gdb \  
-					bison flex \
-					man \
-					ftp
-COPY . /wu-ftpd
+RUN apt-get update && \
+    apt-get install -y bison \
+                       flex \
+                       ftp \
+                       gcc \
+                       gdb \
+                       make \
+                       man \
+                       vim
 
-WORKDIR /wu-ftpd/wu-ftpd-2.6.0/
-RUN ./configure
-RUN mkdir /usr/man/
-RUN mkdir /usr/man/man8 && cp ./doc/ftpd.8 /usr/man/man8
-RUN mkdir /usr/man/man1 && cp ./doc/ftpcount.1 /usr/man/man1
-RUN mkdir /usr/man/man5 && cp ./doc/ftpaccess.5 /usr/man/man5
-RUN sed -i 's/\t=\t{/\t{/g' src/ftpcmd.y
-RUN make && make install
-RUN cp ../configs/* /etc/
+COPY configs/* /etc/
+COPY wu-ftpd-2.6.0 /usr/src/wu-ftpd
+WORKDIR /usr/src/wu-ftpd/
 
-RUN echo "ftp:*:400:400:Anonymous FTP:/home/ftp:/bin/tru" >> /etc/passwd
-RUN echo "ftp:x:400:" >> /etc/group
-RUN mkdir /home/ftp
-RUN chmod 555 /home/ftp
-RUN chown root:ftp /home/ftp
-RUN mkdir /home/ftp/bin/
-RUN chmod 111 /home/ftp/bin/
-
-WORKDIR bin/
+RUN ./configure --mandir="/usr/share/man" && \
+    sed -i 's/\t=\t{/\t{/g' src/ftpcmd.y && \
+    make && make install && \
+    echo "ftp:*:400:400:Anonymous FTP:/home/ftp:/bin/tru" >> /etc/passwd && \
+    echo "ftp:x:400:" >> /etc/group && \
+    mkdir -p /home/ftp/bin && \
+    chmod 555 /home/ftp && \
+    chown root:ftp /home/ftp && \
+    chmod 111 /home/ftp/bin
 
+ENTRYPOINT ["/usr/src/wu-ftpd/bin/ftpd"]
+CMD ["-S"]

README.md

@@ -1,23 +1,58 @@
 # wu-ftp_Exploit_Test
-Docker build of wu-ftp to allow for easy exploitation.
+
+_Dockerized wu-ftp for easy exploitation_
 
 ## Build Instructions
-`docker build -t wu-ftpd:v1 .`
+
+### Docker Compose
+
+```sh
+docker-compose build
+```
+
+### Docker
+
+```sh
+docker build -t neverrend/wu-ftpd:v1 .
+```
 
 ## Run Instructions
-`docker run -p 21:21 -it wu-ftpd`
 
-From the container run to start the FTPD service:
-`# ./ftpd -S`
+Note: these commands assume they are being run directly from the repository.
+
+### Docker Compose
+
+```sh
+docker-compose up -d
+```
+
+### Docker
+
+```sh
+docker run -v "$(pwd)/exploits:/tmp/exploits" -p 21:21 -d neverrend/wu-ftpd:v1
+```
 
 ## Connecting Instructions
-On the host machine connect with ftp:
-`ftp localhost`
 
-Use the username anonymous and pass foo.
+On the host machine connect via `ftp`:
+
+```sh
+ftp localhost
+```
+
+The username is `anonymous` and the password is `foo`.
+
+Alternatively, one can also access the service via `curl`:
 
-## Misc
-THIS IS FOR TESTING EXPLOITS DO NOT USE THIS AS A REAL FTP SERVER!!!!
+```sh
+curl -u anonymous:foo ftp://localhost
+```
+
+## WARNING
+
+**THIS IS FOR TESTING EXPLOITS DO NOT USE THIS AS A REAL FTP SERVER!!!!**
 
 ## TODO
-Add code highlight the exploits
+
+- Add code highlight the exploits
+

docker-compose.yml

@@ -0,0 +1,9 @@
+version: "3"
+services:
+  ftp:
+    build: .
+    image: neverrend/wu-ftpd:v1
+    ports:
+      - 21:21
+    volumes:
+      - ./exploits:/tmp/exploits