Skip to content

Commit d8e5541

Browse files
Fix build sbt (#52)
1 parent 9888fc2 commit d8e5541

File tree

1 file changed

+3
-15
lines changed

1 file changed

+3
-15
lines changed

project/SbtDASPlugin.scala

+3-15
Original file line numberDiff line numberDiff line change
@@ -140,27 +140,15 @@ object SbtDASPlugin extends AutoPlugin {
140140
ver.replaceAll("[+]", "-").replaceAll("[^\\w.-]", "-")
141141
},
142142

143-
// Let Docker push to GHCR by default, or dev override with DEV_REGISTRY
143+
// Let Docker push to GHCR by default
144144
dockerAlias := {
145-
val devRegistry = sys.env.getOrElse("DEV_REGISTRY", s"ghcr.io/$orgUsername/${repoNameSetting.value}")
145+
val devRegistry = s"ghcr.io/$orgUsername/${repoNameSetting.value}"
146146
dockerAlias.value.withRegistryHost(Some(devRegistry))
147147
},
148148

149-
// Optionally push to multiple registries if RELEASE_DOCKER_REGISTRY is set
150-
dockerAliases := {
151-
val devRegistry = sys.env.getOrElse("DEV_REGISTRY", s"ghcr.io/$orgUsername/${repoNameSetting.value}")
152-
val releaseRegistry = sys.env.get("RELEASE_DOCKER_REGISTRY")
153-
154-
val baseAlias = dockerAlias.value.withRegistryHost(Some(devRegistry))
155-
releaseRegistry match {
156-
case Some(rr) => Seq(baseAlias, dockerAlias.value.withRegistryHost(Some(rr)))
157-
case None => Seq(baseAlias)
158-
}
159-
},
160-
161149
// Define the printDockerImageName task
162150
printDockerImageName := {
163-
val alias = (Docker / dockerAliases).value.head
151+
val alias = (Docker / dockerAlias).value
164152
println(s"DOCKER_IMAGE=$alias")
165153
})
166154

0 commit comments

Comments
 (0)