Merge pull request #21 from codacy/smaller-image

Change base image

Author: mrfyda

build.sbt

@@ -27,25 +27,26 @@ version in Docker := "1.0"
 organization := "com.codacy"
 
 val installAll =
-  s"""apk update && apk add bash curl &&
-     |apk add --update python &&
-     |apk add --update python3 &&
-     |apk add wget ca-certificates &&
-     |apk add git &&
+  s"""apk --no-cache add bash wget ca-certificates git &&
+     |apk add --update --no-cache python &&
+     |apk add --update --no-cache python3 &&
      |wget "https://bootstrap.pypa.io/get-pip.py" -O /dev/stdout | python &&
      |wget "https://bootstrap.pypa.io/get-pip.py" -O /dev/stdout | python3 &&
-     |apk del wget ca-certificates &&
-     |rm /var/cache/apk/* &&
-     |python -m pip install django==1.9.2 flask==0.10.1 pylint-flask==0.1 flask-wtf==0.12 &&
-     |python3 -m pip install django==1.9.2 flask==0.10.1  pylint-flask==0.1 flask-wtf==0.12 &&
-     |python -m pip install git+https://github.com/landscapeio/pylint-django@93fd04120d0690189c35b7b2eaace23117f388c5 &&
-     |python3 -m pip install git+https://github.com/landscapeio/pylint-django@93fd04120d0690189c35b7b2eaace23117f388c5 &&
+     |python -m pip install django==1.9.2 flask==0.10.1 pylint-flask==0.1 flask-wtf==0.12 --upgrade --ignore-installed --no-cache-dir &&
+     |python3 -m pip install django==1.9.2 flask==0.10.1  pylint-flask==0.1 flask-wtf==0.12 --upgrade --ignore-installed --no-cache-dir &&
+     |python -m pip install git+https://github.com/landscapeio/pylint-django@93fd04120d0690189c35b7b2eaace23117f388c5 --upgrade --ignore-installed --no-cache-dir &&
+     |python3 -m pip install git+https://github.com/landscapeio/pylint-django@93fd04120d0690189c35b7b2eaace23117f388c5 --upgrade --ignore-installed --no-cache-dir &&
      |python -m pip install pylint-common==0.2.2 &&
      |python3 -m pip install pylint-common==0.2.2 &&
      |python -m pip install pylint-celery==0.3 &&
      |python3 -m pip install pylint-celery==0.3 &&
      |python -m pip install pylint==1.6.4 --upgrade --ignore-installed --no-cache-dir &&
-     |python3 -m pip install pylint==1.6.4 --upgrade --ignore-installed --no-cache-dir""".stripMargin.replaceAll(System.lineSeparator()," ")
+     |python3 -m pip install pylint==1.6.4 --upgrade --ignore-installed --no-cache-dir &&
+     |python -m pip uninstall -y pip &&
+     |python3 -m pip uninstall -y pip &&
+     |apk del wget ca-certificates git &&
+     |rm -rf /tmp/* &&
+     |rm -rf /var/cache/apk/*""".stripMargin.replaceAll(System.lineSeparator()," ")
 
 mappings in Universal <++= (resourceDirectory in Compile) map { (resourceDir: File) =>
   val src = resourceDir / "docs"
@@ -64,16 +65,18 @@ daemonUser in Docker := dockerUser
 
 daemonGroup in Docker := dockerGroup
 
-dockerBaseImage := "frolvlad/alpine-oraclejdk8"
+dockerBaseImage := "develar/java"
 
 dockerCommands := dockerCommands.value.flatMap {
   case cmd@Cmd("WORKDIR", _) => List(cmd,
     Cmd("RUN", installAll)
   )
   case cmd@(Cmd("ADD", "opt /opt")) => List(cmd,
     Cmd("RUN", "mv /opt/docker/docs /docs"),
-    Cmd("RUN", "adduser -u 2004 -D docker"),
+    Cmd("RUN", s"adduser -u 2004 -D $dockerUser"),
     ExecCmd("RUN", Seq("chown", "-R", s"$dockerUser:$dockerGroup", "/docs"): _*)
   )
   case other => List(other)
 }
+
+//dockerBuildOptions ++= Seq("--squash")

project/plugins.sbt

@@ -1 +1 @@
-addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.0.3")
+addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.2.0-M8")