From 487109a4ce61d70d9cabc156416c5c7efc788ab6 Mon Sep 17 00:00:00 2001
From: lanjelot <lanjelot@gmail.com>
Date: Thu, 17 Jun 2021 19:24:56 +1000
Subject: [PATCH] Fix Dockerfile

---
 Dockerfile | 31 +++++++++++++++++++------------
 patator.py |  2 +-
 release.sh |  2 +-
 3 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index a55bd37..3d62408 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,18 +4,23 @@ MAINTAINER Sebastien Macke <lanjelot@gmail.com>
 
 ENV DEBIAN_FRONTEND=noninteractive 
 
-RUN apt-get update && apt-get install -y \
-  build-essential \
-  libcurl4-openssl-dev python3-dev libssl-dev \
-  ldap-utils \
-  libmariadbclient-dev \
-  libpq-dev \
-  ike-scan unzip default-jdk \
-  libsqlite3-dev libsqlcipher-dev \
-  python3-pip python-pip
+RUN apt-get update \
+  && apt-get install -y \
+    build-essential python3-setuptools \
+    libcurl4-openssl-dev python3-dev libssl-dev \
+    ldap-utils \
+    libmariadbclient-dev \
+    libpq-dev \
+    ike-scan unzip default-jdk \
+    libsqlite3-dev libsqlcipher-dev \
+    python3-pip python-pip \
+  && rm -rf /var/lib/apt/lists/*
 
 # cx_oracle
-RUN apt-get update && apt-get install -y libaio1 wget unzip git
+RUN apt-get update \
+  && apt-get install -y libaio1 wget unzip git \
+  && rm -rf /var/lib/apt/lists/*
+
 WORKDIR /opt/oracle
 RUN wget https://download.oracle.com/otn_software/linux/instantclient/instantclient-basiclite-linuxx64.zip \
  && wget https://download.oracle.com/otn_software/linux/instantclient/instantclient-sdk-linuxx64.zip \
@@ -33,7 +38,8 @@ RUN git clone --branch 5.3 https://github.com/oracle/python-cx_Oracle \
 
 # xfreerdp (see https://github.com/FreeRDP/FreeRDP/wiki/Compilation)
 RUN apt-get update && apt-get install -y ninja-build build-essential git-core debhelper cdbs dpkg-dev autotools-dev cmake pkg-config xmlto libssl-dev docbook-xsl xsltproc libxkbfile-dev libx11-dev libwayland-dev libxrandr-dev libxi-dev libxrender-dev libxext-dev libxinerama-dev libxfixes-dev libxcursor-dev libxv-dev libxdamage-dev libxtst-dev libcups2-dev libpcsclite-dev libasound2-dev libpulse-dev libjpeg-dev libgsm1-dev libusb-1.0-0-dev libudev-dev libdbus-glib-1-dev uuid-dev libxml2-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libfaad-dev libfaac-dev \
- && apt-get install -y libavutil-dev libavcodec-dev libavresample-dev
+ && apt-get install -y libavutil-dev libavcodec-dev libavresample-dev \
+ && rm -rf /var/lib/apt/lists/*
 WORKDIR /opt/FreeRDP
 RUN git clone https://github.com/FreeRDP/FreeRDP/ .
 RUN cmake -DCMAKE_BUILD_TYPE=Debug -DWITH_SSE2=ON . && cmake --build . && cmake --build . --target install
@@ -45,7 +51,8 @@ RUN python3 -m pip install -r requirements.txt
 RUN sed -e '/cx_Oracle/d' -e 's,pysqlcipher3,pysqlcipher,' requirements.txt | python2 -m pip install -r /dev/stdin
 
 # utils
-RUN apt-get update && apt-get install -y ipython3 ipython iputils-ping iproute2 netcat curl rsh-client telnet vim mlocate nmap
+RUN apt-get update && apt-get install -y ipython3 ipython iputils-ping iproute2 netcat curl rsh-client telnet vim mlocate nmap \
+  && rm -rf /var/lib/apt/lists/*
 RUN echo 'set bg=dark' > /root/.vimrc
 
 COPY ./patator.py ./
diff --git a/patator.py b/patator.py
index d33845e..f39bffb 100755
--- a/patator.py
+++ b/patator.py
@@ -714,7 +714,7 @@ class Logger:
     self.send('setLevel', level)
 
   def warn(self, msg):
-    self.send('warn', msg)
+    self.send('warning', msg)
 
   def info(self, msg):
     self.send('info', msg)
diff --git a/release.sh b/release.sh
index ee007bc..e9dd072 100755
--- a/release.sh
+++ b/release.sh
@@ -6,7 +6,7 @@ DOCKER_IMAGE='lanjelot/patator'
 GIT_REPO='https://github.com/lanjelot/patator'
 TMP_COPY=$(mktemp -d)
 
-git clone -b master $GIT_REPO  $TMP_COPY
+git clone -b master $GIT_REPO $TMP_COPY
 cd $TMP_COPY
 VERSION=$(echo `git tag|sort -V|tail -1`-`git rev-parse --verify HEAD|cut -b -7`)
 sed -i -e "s,^__version__.*$,__version__ = '$VERSION'," patator.py