diff --git a/build.sbt b/build.sbt index 04fe89e09..98e9ecb18 100644 --- a/build.sbt +++ b/build.sbt @@ -108,6 +108,7 @@ lazy val apiDockerSettings = Seq( dockerBaseImage := "openjdk:8u171-jdk", dockerUsername := Some("vinyldns"), packageName in Docker := "api", + dockerUpdateLatest := true, dockerExposedPorts := Seq(9000), dockerEntrypoint := Seq("/opt/docker/bin/boot"), dockerExposedVolumes := Seq("/opt/docker/lib_extra"), // mount extra libs to the classpath @@ -134,6 +135,7 @@ lazy val portalDockerSettings = Seq( dockerBaseImage := "openjdk:8u171-jdk", dockerUsername := Some("vinyldns"), packageName in Docker := "portal", + dockerUpdateLatest := true, dockerExposedPorts := Seq(9001), dockerExposedVolumes := Seq("/opt/docker/lib_extra"), // mount extra libs to the classpath dockerExposedVolumes := Seq("/opt/docker/conf"), // mount extra config to the classpath @@ -159,6 +161,12 @@ lazy val apiPublishSettings = Seq( publish := (publish in Docker).value ) +lazy val portalPublishSettings = Seq( + publishArtifact := false, + publishLocal := (publishLocal in Docker).value, + publish := (publish in Docker).value +) + lazy val pbSettings = Seq( version in ProtobufConfig := "2.6.1" ) @@ -230,7 +238,7 @@ val createJsHeaders = TaskKey[Unit]("createJsHeaders", "Runs script to prepend A lazy val portal = (project in file("modules/portal")).enablePlugins(PlayScala, AutomateHeaderPlugin) .settings(sharedSettings) .settings(testSettings) - .settings(noPublishSettings) + .settings(portalPublishSettings) .settings(portalDockerSettings) .settings( name := "portal", diff --git a/docker/docker-compose-build.yml b/docker/docker-compose-build.yml index 7d4911ed1..cd3c496bf 100644 --- a/docker/docker-compose-build.yml +++ b/docker/docker-compose-build.yml @@ -35,7 +35,7 @@ services: - ./elasticmq/custom.conf:/etc/elasticmq/elasticmq.conf api: - image: "vinyldns/api:0.1" # the version of the api image we want to pull + image: "vinyldns/api:latest" environment: - REST_PORT=9000 container_name: "vinyldns-api" @@ -48,7 +48,7 @@ services: - dynamodb portal: - image: "vinyldns/portal:0.1" # the version of the portal image we want to pull + image: "vinyldns/portal:latest" ports: - "9001:9001" container_name: "vinyldns-portal"