Skip to content

Commit

Permalink
Fix docker image building
Browse files Browse the repository at this point in the history
  • Loading branch information
Alexander Ryabokon committed Oct 18, 2023
1 parent 0d6493b commit f38c549
Showing 1 changed file with 22 additions and 2 deletions.
24 changes: 22 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -85,14 +85,21 @@ springBoot {
buildInfo()
}

val dockerRegistry = System.getenv().getOrDefault("DOCKER_REGISTRY", project.properties["docker.registry"]) as? String
val octopusGithubDockerRegistry = System.getenv().getOrDefault("OCTOPUS_GITHUB_DOCKER_REGISTRY", project.properties["octopus.github.docker.registry"]) as? String

docker {
springBootApplication {
baseImage.set("${rootProject.properties["docker.registry"]}/openjdk:11")
baseImage.set("$dockerRegistry/openjdk:11")
ports.set(listOf(8765, 8765))
images.set(setOf("${rootProject.properties["publishing.docker.registry"]}/${project.name}:${project.version}"))
images.set(setOf("$octopusGithubDockerRegistry/octopusden/${project.name}:${project.version}"))
}
}

tasks.getByName("dockerBuildImage").doFirst {
validateDockerRegistryParams()
}

dependencies {
implementation(platform("org.springframework.cloud:spring-cloud-dependencies:${project.property("spring-cloud.version")}"))
implementation(enforcedPlatform("org.springframework.boot:spring-boot-dependencies:${project.properties["spring-boot.version"]}"))
Expand Down Expand Up @@ -127,3 +134,16 @@ dependencies {
exclude("org.springframework.cloud")
}
}

fun validateDockerRegistryParams() {
if (dockerRegistry.isNullOrBlank() || octopusGithubDockerRegistry.isNullOrBlank()) {
throw IllegalArgumentException(
"Start gradle build with" +
(if (dockerRegistry.isNullOrBlank()) " -Pdocker.registry=..." else "") +
(if (octopusGithubDockerRegistry.isNullOrBlank()) " -Poctopus.github.docker.registry=..." else "") +
" or set env variable(s):" +
(if (dockerRegistry.isNullOrBlank()) " DOCKER_REGISTRY" else "") +
(if (octopusGithubDockerRegistry.isNullOrBlank()) " OCTOPUS_GITHUB_DOCKER_REGISTRY" else "")
)
}
}

0 comments on commit f38c549

Please sign in to comment.