diff --git a/src/main/scala/com/typesafe/sbt/packager/docker/DockerPlugin.scala b/src/main/scala/com/typesafe/sbt/packager/docker/DockerPlugin.scala index 03b4a09bb..c8596395e 100644 --- a/src/main/scala/com/typesafe/sbt/packager/docker/DockerPlugin.scala +++ b/src/main/scala/com/typesafe/sbt/packager/docker/DockerPlugin.scala @@ -63,6 +63,8 @@ object DockerPlugin extends AutoPlugin { override lazy val projectSettings = Seq( dockerBaseImage := "dockerfile/java:latest", + dockerExposedPorts := Seq(), + dockerExposedVolumes := Seq(), name in Docker <<= name, packageName in Docker <<= packageName, executableScriptName in Docker <<= executableScriptName, @@ -74,8 +76,6 @@ object DockerPlugin extends AutoPlugin { ) ++ mapGenericFilesToDocker ++ inConfig(Docker)(Seq( daemonUser := "daemon", defaultLinuxInstallLocation := "/opt/docker", - dockerExposedPorts := Seq(), - dockerExposedVolumes := Seq(), dockerPackageMappings <<= (sourceDirectory) map { dir => MappingsHelper contentOf dir }, diff --git a/src/sbt-test/docker/ports/build.sbt b/src/sbt-test/docker/ports/build.sbt new file mode 100644 index 000000000..32db8356b --- /dev/null +++ b/src/sbt-test/docker/ports/build.sbt @@ -0,0 +1,7 @@ +enablePlugins(SbtNativePackager) + +name := "simple-test" + +version := "0.1.0" + +dockerExposedPorts := Seq(9000) diff --git a/src/sbt-test/docker/ports/project/plugins.sbt b/src/sbt-test/docker/ports/project/plugins.sbt new file mode 100644 index 000000000..b53de154c --- /dev/null +++ b/src/sbt-test/docker/ports/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % sys.props("project.version")) diff --git a/src/sbt-test/docker/ports/test b/src/sbt-test/docker/ports/test new file mode 100644 index 000000000..877627706 --- /dev/null +++ b/src/sbt-test/docker/ports/test @@ -0,0 +1,3 @@ +# Stage the distribution and ensure files show up. +> docker:stage +$ exec grep -q -F 'EXPOSE 9000' target/docker/Dockerfile