Skip to content

Commit 5b29d3e

Browse files
respencer-nclclaude
andcommitted
Default Docker registry to Artifact Registry in dockerDual
Changed default registry from ghcr.io to Google Artifact Registry (us-central1-docker.pkg.dev/ossuminc-production/ossum-images). Added repository and registryPath parameters to dockerDual() so callers can override functionally without imperative settings. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent df6b059 commit 5b29d3e

1 file changed

Lines changed: 11 additions & 5 deletions

File tree

src/main/scala/com/ossuminc/sbt/helpers/Packaging.scala

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@ object Packaging extends AutoPluginHelper {
4545
)
4646
}
4747

48-
/** Default base images for dual Docker builds */
48+
/** Default base images and registry for dual Docker builds */
4949
object Defaults {
5050
val devBaseImage = "eclipse-temurin:25-jdk-noble"
5151
val prodBaseImage = "gcr.io/distroless/java25-debian13:nonroot"
52-
val repository = "ghcr.io"
53-
val username = "ossuminc"
52+
val repository = "us-central1-docker.pkg.dev"
53+
val username = "ossuminc-production/ossum-images"
5454
}
5555

5656
override def apply(project: Project) = none(project)
@@ -113,13 +113,19 @@ object Packaging extends AutoPluginHelper {
113113
* Docker image name (e.g., "riddl-mcp-server")
114114
* @param exposedPorts
115115
* Ports to expose in the container
116+
* @param repository
117+
* Docker registry host (default: Artifact Registry)
118+
* @param registryPath
119+
* Registry path after the host (default: ossuminc-production/ossum-images)
116120
* @param pkgDescription
117121
* Optional description for the package
118122
*/
119123
def dockerDual(
120124
mainClass: String,
121125
pkgName: String,
122126
exposedPorts: Seq[Int],
127+
repository: String = Defaults.repository,
128+
registryPath: String = Defaults.username,
123129
pkgDescription: String = ""
124130
)(project: Project): Project = {
125131
project
@@ -132,8 +138,8 @@ object Packaging extends AutoPluginHelper {
132138

133139
// Default Docker settings (dev image - what docker:publishLocal uses)
134140
dockerBaseImage := Keys.dockerDevBaseImage.value,
135-
dockerRepository := Some(Defaults.repository),
136-
dockerUsername := Some(Defaults.username),
141+
dockerRepository := Some(repository),
142+
dockerUsername := Some(registryPath),
137143
Docker / packageName := pkgName,
138144
Docker / packageDescription := pkgDescription,
139145
Docker / daemonUser := "ossum",

0 commit comments

Comments
 (0)