Merge pull request #414 from nnesetto/master

Improvement of Dockerfile and update of commands

Dockerfile

@@ -1,4 +1,4 @@
-FROM kalilinux/kali-rolling
+FROM docker.io/kalilinux/kali-rolling:latest
 
 LABEL org.label-schema.name='Sn1per - Kali Linux' \
     org.label-schema.description='Automated pentest framework for offensive security experts' \
@@ -14,21 +14,21 @@ RUN echo "deb http://http.kali.org/kali kali-rolling main contrib non-free" > /e
 ENV DEBIAN_FRONTEND noninteractive
 
 RUN set -x \
-        && apt-get -yqq update \
-        && apt-get -yqq dist-upgrade \
-        && apt-get clean
-RUN apt-get install -y metasploit-framework
+        && apt -yqq update \
+        && apt -yqq full-upgrade \
+        && apt clean
+RUN apt install --yes metasploit-framework
 
 RUN sed -i 's/systemctl status ${PG_SERVICE}/service ${PG_SERVICE} status/g' /usr/bin/msfdb && \
     service postgresql start && \
     msfdb reinit
 
-RUN apt-get --yes install git \
-    && mkdir -p security \
-    && cd security \
-    && git clone https://github.com/1N3/Sn1per.git \
+WORKDIR /usr/src/app
+
+RUN apt --yes install git bash
+RUN git clone https://github.com/1N3/Sn1per.git \
     && cd Sn1per \
     && ./install.sh \
     && sniper -u force
 
-CMD ["bash"]
+CMD ["sniper"]

Dockerfile.blackarch

@@ -0,0 +1,9 @@
+FROM docker.io/blackarchlinux/blackarch:latest
+
+# Upgrade system
+RUN pacman -Syu --noconfirm
+
+# Install sn1per from official repository
+RUN pacman -Sy sn1per --noconfirm
+
+CMD ["sn1per"]

docker-compose.yml

@@ -0,0 +1,19 @@
+version: '3.9'
+
+x-logging: &default-logging
+  options:
+    max-size: "40m"
+    max-file: "10"
+  driver: json-file
+
+services:
+  kali-linux:
+    container_name: kali-linux
+    build:
+      context: .
+      dockerfile: Dockerfile
+  blackarch:
+    container_name: blackarch
+    build:
+      context: .
+      dockerfile: Dockerfile.blackarch

install.sh

@@ -71,54 +71,54 @@ if [[ $UBUNTU_CHECK == "DISTRIB_ID=Ubuntu" ]]; then
 fi
 
 echo -e "$OKBLUE[*]$RESET Installing package dependencies...$RESET"
-apt-get update
-apt-get install -y python3-paramiko
-apt-get install -y nfs-common
-apt-get install -y nodejs
-apt-get install -y wafw00f
-apt-get install -y xdg-utils
-apt-get install -y ruby
-apt-get install -y rubygems
-apt-get install -y python
-apt-get install -y dos2unix
-apt-get install -y aha
-apt-get install -y libxml2-utils
-apt-get install -y rpcbind
-apt-get install -y cutycapt
-apt-get install -y host
-apt-get install -y whois
-apt-get install -y dnsrecon
-apt-get install -y curl
-apt-get install -y nmap
-apt-get install -y php7.4
-apt-get install -y php7.4-curl
-apt-get install -y hydra
-apt-get install -y sqlmap
-apt-get install -y nbtscan
-apt-get install -y nikto
-apt-get install -y whatweb
-apt-get install -y sslscan
-apt-get install -y jq
-apt-get install -y golang
-apt-get install -y adb
-apt-get install -y xsltproc
-apt-get install -y ldapscripts
-apt-get install -y libssl-dev 2> /dev/null
-apt-get install -y python-pip 2> /dev/null
-apt-get remove -y python3-pip
-apt-get install -y python3-pip
-apt-get install -y xmlstarlet
-apt-get install -y net-tools
-apt-get install -y p7zip-full
-apt-get install -y jsbeautifier
-apt-get install -y theharvester 2> /dev/null
-apt-get install -y phantomjs 2> /dev/null
-apt-get install -y chromium 2> /dev/null
-apt-get install -y xvfb
-apt-get install -y urlcrazy
-apt-get install -y iputils-ping
-apt-get install -y enum4linux
-apt-get install -y dnsutils
+apt update
+apt install -y python3-paramiko
+apt install -y nfs-common
+apt install -y nodejs
+apt install -y wafw00f
+apt install -y xdg-utils
+apt install -y ruby
+apt install -y rubygems
+apt install -y python
+apt install -y dos2unix
+apt install -y aha
+apt install -y libxml2-utils
+apt install -y rpcbind
+apt install -y cutycapt
+apt install -y host
+apt install -y whois
+apt install -y dnsrecon
+apt install -y curl
+apt install -y nmap
+apt install -y php7.4
+apt install -y php7.4-curl
+apt install -y hydra
+apt install -y sqlmap
+apt install -y nbtscan
+apt install -y nikto
+apt install -y whatweb
+apt install -y sslscan
+apt install -y jq
+apt install -y golang
+apt install -y adb
+apt install -y xsltproc
+apt install -y ldapscripts
+apt install -y libssl-dev 2> /dev/null
+apt install -y python-pip 2> /dev/null
+apt purge -y python3-pip
+apt install -y python3-pip
+apt install -y xmlstarlet
+apt install -y net-tools
+apt install -y p7zip-full
+apt install -y jsbeautifier
+apt install -y theharvester 2> /dev/null
+apt install -y phantomjs 2> /dev/null
+apt install -y chromium 2> /dev/null
+apt install -y xvfb
+apt install -y urlcrazy
+apt install -y iputils-ping
+apt install -y enum4linux
+apt install -y dnsutils
 
 echo -e "$OKBLUE[*]$RESET Installing Metasploit...$RESET"
 curl https://raw.githubusercontent.com/rapid7/metasploit-omnibus/master/config/templates/metasploit-framework-wrappers/msfupdate.erb > /tmp/msfinstall