From e1bdd70402fade664741987cd7d1b32a32936f84 Mon Sep 17 00:00:00 2001
From: mach1el <atemhacking@gmail.com>
Date: Fri, 10 Jul 2020 23:52:46 +0700
Subject: [PATCH] Using blackarch repo instead of yay

---
 Dockerfile | 84 +++++++++++++++++++++++++++++++++++-------------------
 README.md  |  4 ++-
 2 files changed, 57 insertions(+), 31 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 9c9f2c5..ca02d68 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,43 +1,67 @@
 FROM archlinux:latest
 
+WORKDIR /tmp/
+RUN curl -O https://blackarch.org/strap.sh
+RUN chmod +x strap.sh
+RUN ./strap.sh
+
 WORKDIR /root/
 RUN echo '[multilib]' >> /etc/pacman.conf
 RUN echo 'Include = /etc/pacman.d/mirrorlist' >> /etc/pacman.conf
-RUN pacman -Syu --needed --noconfirm
-RUN pacman -S base base-devel --needed --noconfirm
-
-RUN pacman -Sy --noconfirm net-tools zip unrar sslsplit sqlmap john hydra\
- zsh git wget vim nano gdb python python-pip python2 python2-pip rpcbind\
- binutils openssl libffi python2-paramiko python-paramiko mlocate\
- nmap nikto openssh sshpass openvpn samba smbclient openldap\
- metasploit exploitdb mitmproxy binwalk gnu-netcat
-
-RUN wget https://raw.githubusercontent.com/samba-team/samba/master/examples/smb.conf.default -O /etc/samba/smb.conf
-
-RUN wget https://raw.githubusercontent.com/evyatarmeged/stegextract/master/stegextract -O /usr/bin/stegextract &&\
-	chmod +x /usr/bin/stegextract
 
-RUN wget https://raw.githubusercontent.com/AonCyberLabs/PadBuster/master/padBuster.pl -O /usr/bin/padbuster &&\
-    chmod +x /usr/bin/padbuster
+RUN pacman -Syy --noconfirm \
+	base \
+	base-devel \
+	zip \
+	unrar \
+	sslsplit \
+	sqlmap \
+	john \
+	hydra \
+	zsh \
+	git \
+	wget \
+	vim \
+	nano \
+	gdb \
+	python \
+	python-pywinrm \
+	python-pip \
+	python2 \
+	python2-pip \
+	rpcbind \
+	binutils \
+	openssl \
+	libffi \
+	mlocate \
+	nmap \
+	nikto \
+	openssh \
+	sshpass \
+	samba \
+	smbclient \
+	openldap \
+	metasploit \
+	mitmproxy \
+	binwalk \
+	gnu-netcat \
+	evil-winrm \
+	padbuster \
+	wfuzz \
+	dirb \
+	gobuster \
+	enum4linux \
+	stegsolve \
+	steghide
 
-RUN git clone https://github.com/danielmiessler/SecLists.git /usr/share/seclists
+RUN wget https://raw.githubusercontent.com/evyatarmeged/stegextract/master/stegextract -O /usr/bin/stegextract \
+	&& chmod +x /usr/bin/stegextract
 
-RUN gem install evil-winrm
 RUN pip install impacket stegcracker shodan BeautifulSoup4 -U --force-reinstall
 
-RUN sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
-
-RUN chmod 640 /etc/sudoers && echo '%wheel ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers && chmod 440 /etc/sudoers && useradd -m -pyay -G wheel yay
-RUN rm -rf /tmp/yay &&\
-	sudo -u yay git clone https://aur.archlinux.org/yay.git /tmp/yay &&\
-	cd /tmp/yay &&\
-	pacman -Syy &&\
-	yes | sudo -u yay makepkg -sci &&\
-	cd /root/
+RUN wget https://raw.githubusercontent.com/samba-team/samba/master/examples/smb.conf.default -O /etc/samba/smb.conf
 
-RUN sudo -u yay yay -S --overwrite='*' smbmap enum4linux stegsolve steghide perl-image-exiftool masscan dirbuster dirb jre11-openjdk --noconfirm
-RUN go get github.com/OJ/gobuster
+RUN sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
 
 COPY .zshrc /root/
-ENV PATH="${PATH}:/root/.gem/ruby/2.7.0/bin:/root/go/bin"
-CMD ["/bin/zsh"]
+CMD ["/bin/zsh"]
\ No newline at end of file
diff --git a/README.md b/README.md
index 27577fc..553e9b1 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,10 @@
 # Arch pentest docker
+![License](https://img.shields.io/github/license/mach1el/docker-archsec?color=red&style=plastic) ![Version](https://img.shields.io/github/v/release/mach1el/docker-archsec?style=plastic) 
+
 This docker image was created to build minial and important tools which needed to pentest and pratice CTF.Based on [Arch linux](https://www.archlinux.org/) and using [BlackArch's](https://blackarch.org/) repo to install the tools.
 
 ### Build the image
-    git clone https://github.com/t7hm1/arch-pentest-docker.git && cd arch-pentest-docker/
+    git clone https://github.com/mach1el/docker-archsec.git && cd docker-archsec/
     docker image build -t archsec .
 
 ### Run the image