From ab1748f25a1febc759f58a170525f7b9994c7c2a Mon Sep 17 00:00:00 2001
From: mrb <michaelrbernstein@gmail.com>
Date: Mon, 13 Jun 2016 13:31:34 -0400
Subject: [PATCH] Slim Dockerfile and run fewer rules by default

---
 Dockerfile                        | 20 ++++++++--------
 config/codeclimate_checkstyle.xml | 38 -------------------------------
 2 files changed, 9 insertions(+), 49 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index e64056a..5894f2a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,21 +1,19 @@
-FROM java
+FROM java:8-jre
 
-MAINTAINER Sivakumar Kailasam 
+MAINTAINER Sivakumar Kailasam
 
-# Groovy setup, defined multiple RUN steps for better caching resulting in quicker builds
-RUN cd /tmp 
-RUN wget http://dl.bintray.com/groovy/maven/groovy-binary-2.4.0-beta-4.zip 
-RUN unzip groovy-binary-2.4.0-beta-4.zip 
-RUN mv groovy-2.4.0-beta-4 /groovy 
-RUN rm groovy-binary-2.4.0-beta-4.zip
+RUN cd /tmp && \
+     wget http://dl.bintray.com/groovy/maven/apache-groovy-binary-2.4.6.zip && \
+	 unzip apache-groovy-binary-2.4.6.zip && \
+	 mv groovy-2.4.6 /groovy  && \
+	 rm apache-groovy-binary-2.4.6.zip
 
-# Set Groovy path
 ENV GROOVY_HOME /groovy
 ENV PATH $GROOVY_HOME/bin/:$PATH
 
-RUN useradd -r -s /bin/false app 
+RUN groupadd app -g 9000 && useradd -g 9000 -u 9000 -r -s /bin/false app
 
-# Codeclimate specific setup
+VOLUME /code
 WORKDIR /code
 COPY . /usr/src/app
 
diff --git a/config/codeclimate_checkstyle.xml b/config/codeclimate_checkstyle.xml
index cf65e39..240112d 100644
--- a/config/codeclimate_checkstyle.xml
+++ b/config/codeclimate_checkstyle.xml
@@ -9,11 +9,6 @@
     <property name="severity" value="warning"/>
 
     <property name="fileExtensions" value="java, properties, xml"/>
-    <!-- Checks for whitespace                               -->
-    <!-- See http://checkstyle.sf.net/config_whitespace.html -->
-        <module name="FileTabCharacter">
-            <property name="eachLine" value="true"/>
-        </module>
 
     <module name="TreeWalker">
         <module name="OuterTypeFilename"/>
@@ -39,24 +34,11 @@
             <property name="tokens" value="LITERAL_TRY, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH"/>
         </module>
         <module name="NeedBraces"/>
-        <module name="LeftCurly">
-            <property name="maxLineLength" value="100"/>
-        </module>
         <module name="RightCurly"/>
         <module name="RightCurly">
             <property name="option" value="alone"/>
             <property name="tokens" value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, LITERAL_DO, STATIC_INIT, INSTANCE_INIT"/>
         </module>
-        <module name="WhitespaceAround">
-            <property name="allowEmptyConstructors" value="true"/>
-            <property name="allowEmptyMethods" value="true"/>
-            <property name="allowEmptyTypes" value="true"/>
-            <property name="allowEmptyLoops" value="true"/>
-            <message key="ws.notFollowed"
-             value="WhitespaceAround: ''{0}'' is not followed by whitespace. Empty blocks may only be represented as '{}' when not part of a multi-block statement (4.1.3)"/>
-             <message key="ws.notPreceded"
-             value="WhitespaceAround: ''{0}'' is not preceded with whitespace."/>
-        </module>
         <module name="OneStatementPerLine"/>
         <module name="MultipleVariableDeclarations"/>
         <module name="ArrayTypeStyle"/>
@@ -112,24 +94,6 @@
              value="Method type name ''{0}'' must match pattern ''{1}''."/>
         </module>
         <module name="NoFinalizer"/>
-        <module name="GenericWhitespace">
-            <message key="ws.followed"
-             value="GenericWhitespace ''{0}'' is followed by whitespace."/>
-             <message key="ws.preceded"
-             value="GenericWhitespace ''{0}'' is preceded with whitespace."/>
-             <message key="ws.illegalFollow"
-             value="GenericWhitespace ''{0}'' should followed by whitespace."/>
-             <message key="ws.notPreceded"
-             value="GenericWhitespace ''{0}'' is not preceded with whitespace."/>
-        </module>
-        <module name="Indentation">
-            <property name="basicOffset" value="2"/>
-            <property name="braceAdjustment" value="0"/>
-            <property name="caseIndent" value="2"/>
-            <property name="throwsIndent" value="4"/>
-            <property name="lineWrappingIndentation" value="4"/>
-            <property name="arrayInitIndent" value="2"/>
-        </module>
         <module name="AbbreviationAsWordInName">
             <property name="ignoreFinal" value="false"/>
             <property name="allowedAbbreviationLength" value="1"/>
@@ -137,9 +101,7 @@
         <module name="OverloadMethodsDeclarationOrder"/>
         <module name="VariableDeclarationUsageDistance"/>
         <module name="CustomImportOrder">
-            <property name="specialImportsRegExp" value="com.google"/>
             <property name="sortImportsInGroupAlphabetically" value="true"/>
-            <property name="customImportOrderRules" value="STATIC###SPECIAL_IMPORTS###THIRD_PARTY_PACKAGE###STANDARD_JAVA_PACKAGE"/>
         </module>
         <module name="MethodParamPad"/>
         <module name="OperatorWrap">