Merge pull request #771 from sbt/wip/docker-stage-tests

Add a few docker tests for travis

Author: muuki88

.travis.yml

@@ -12,7 +12,7 @@ script:
   - ./sbt ++$SCALA_VERSION --warn update compile test:compile
   - ./sbt ++$SCALA_VERSION test "scripted universal/* jar/*"
   - if [[ "$TRAVIS_OS_NAME" = "linux" ]]; then
-      ./sbt ++$SCALA_VERSION "scripted rpm/* debian/*";
+      ./sbt ++$SCALA_VERSION "scripted rpm/* debian/* docker/staging docker/entrypoint docker/ports docker/volumes";
     fi
   - if [[ "$TRAVIS_JDK_VERSION" = "oraclejdk8" ]]; then
       ./sbt ++$SCALA_VERSION "scripted jdkpackager/test-package-minimal jdkpackager/test-package-mappings";
@@ -30,9 +30,9 @@ matrix:
       jdk: openjdk7
     - os: linux
       jdk: oraclejdk8
- 
+
 sudo: false
-cache: 
+cache:
  apt: true
  directories:
  - $HOME/.sbt

src/main/scala/com/typesafe/sbt/packager/docker/DockerPlugin.scala

@@ -52,7 +52,7 @@ import SbtNativePackager.{ Universal, Linux }
 object DockerPlugin extends AutoPlugin {
 
   object autoImport extends DockerKeys {
-    val Docker = config("docker") extend Universal
+    val Docker = config("docker")
   }
 
   import autoImport._

test-project-docker/build.sbt

@@ -1,5 +1,3 @@
-import com.typesafe.sbt.packager.docker._
-
 enablePlugins(JavaAppPackaging, DockerSpotifyClientPlugin)
 
 name := "docker-test"