From a84bededb07d45c9936d274ba4f6099abd7da02d Mon Sep 17 00:00:00 2001
From: Ne0nd0g <Russel.VanTuyl@gmail.com>
Date: Thu, 17 Feb 2022 08:27:10 -0500
Subject: [PATCH] Added Integrity level field

---
 Dockerfile        | 57 ++++-------------------------------------------
 docs/CHANGELOG.MD |  3 ++-
 pkg/merlin.go     |  2 +-
 3 files changed, 7 insertions(+), 55 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 51ee517b..7bc1670d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,60 +1,11 @@
-FROM golang:1.16-buster
+FROM ne0nd0g/merlin-base
 
 # Build the Docker image first
 #  > sudo docker build -t merlin .
 
-# To start the Merlin Server, run
-#  > sudo docker run -it -p 443:443 -v ~/merlin-server-log:/opt/merlin/data/log -v ~/merlin-agent-logs:/opt/merlin/data/agents merlin:latest
+# To start the Merlin Server and interact with it, run:
+#  > sudo docker run -it -p 443:443 -v ~/merlin:/opt/merlin/data merlin:latest
 
-# Update APT
-RUN apt-get update
-RUN apt-get upgrade -y
-RUN apt-get install -y apt-transport-https vim gcc-mingw-w64 unzip
-
-# Install Microsoft package signing key
-RUN wget --quiet -O - https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > microsoft.asc.gpg
-RUN mv microsoft.asc.gpg /etc/apt/trusted.gpg.d/
-RUN wget --quiet https://packages.microsoft.com/config/debian/10/prod.list
-RUN mv prod.list /etc/apt/sources.list.d/microsoft-prod.list
-RUN chown root:root /etc/apt/trusted.gpg.d/microsoft.asc.gpg
-RUN chown root:root /etc/apt/sources.list.d/microsoft-prod.list
-
-# Install Microsoft .NET Core 2.1 SDK
-RUN apt-get update
-RUN apt-get install -y dotnet-sdk-2.1
-
-# Clone Merlin Server
-WORKDIR /opt
-RUN git clone --recurse-submodules https://github.com/Ne0nd0g/merlin
 WORKDIR /opt/merlin
-RUN go mod download
-
-# Clone Merlin Agent
-WORKDIR /opt/
-RUN git clone https://github.com/Ne0nd0g/merlin-agent
-WORKDIR /opt/merlin-agent
-RUN go mod download
-RUN make all
-
-# Clone Merlin Agent DLL
-WORKDIR /opt/
-RUN git clone https://github.com/Ne0nd0g/merlin-agent-dll
-WORKDIR /opt/merlin-agent-dll
-RUN go mod download
-RUN make
 
-# Build SharpGen
-WORKDIR /opt/merlin/data/src/cobbr/SharpGen
-RUN dotnet build -c release
-
-# Download Mimikatz
-WORKDIR /opt/merlin/data/src/
-RUN wget https://github.com/gentilkiwi/mimikatz/releases/latest/download/mimikatz_trunk.zip
-RUN unzip mimikatz_trunk.zip -d mimikatz
-RUN rm /opt/merlin/data/src/mimikatz_trunk.zip
-
-# Port that the agent will communicate with the server on
-EXPOSE 443
-
-WORKDIR /opt/merlin
-CMD ["go", "run", "main.go"]
+ENTRYPOINT ["go", "run", "main.go"]
diff --git a/docs/CHANGELOG.MD b/docs/CHANGELOG.MD
index 3b093ddd..530d773e 100644
--- a/docs/CHANGELOG.MD
+++ b/docs/CHANGELOG.MD
@@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## 1.3 - 2022-02-11
+## 1.3 - 2022-02-17
 
 ### Changed
 
@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - The agent menu `info` command now shows the agent's integrity level
   - Windows: `2`-Medium, `3`-High, `4`-System
   - All other OS: `3` - member of sudo group, `4` - running as root
+- Dockerfile now uses [merlin-base](https://hub.docker.com/r/ne0nd0g/merlin-base) image
 
 ## 1.2.1 - 2022-01-10
 
diff --git a/pkg/merlin.go b/pkg/merlin.go
index 68b3e8f9..9f037c00 100644
--- a/pkg/merlin.go
+++ b/pkg/merlin.go
@@ -18,7 +18,7 @@
 package merlin
 
 // Version is a constant variable containing the version number for the Merlin package
-const Version = "1.2.1"
+const Version = "1.3"
 
 // Build is the unique number based off the git commit in which it is compiled against
 var Build = "nonRelease"