infosecn1nja
/
Empire
mirror of https://github.com/infosecn1nja/Empire.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflict 

Fix merge conflict and remove `-b master` which is for branch:master
3.0-Beta
lilyus 2018-03-14 23:16:20 +01:00 committed by GitHub
parent d2bdd9a47c
commit 52b18e6743
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@ -49,11 +49,7 @@ RUN apt-get update && apt-get install -qy \
# build empire from source
# TODO: When we merge to master set branch to master
<<<<<<< HEAD
RUN git clone -b master https://github.com/EmpireProject/Empire.git /opt/Empire && \
=======
RUN git clone --depth=1 -b dev https://github.com/EmpireProject/Empire.git /opt/Empire && \
>>>>>>> cda4927a8567add6801a72c83fb156b54397865e
cd /opt/Empire/setup/ && \
./install.sh && \
rm -rf /opt/Empire/data/empire*