Skip to content

Commit 0b437a2

Browse files
committed
add intermediate task to collect all images required for quickstart
1 parent e389832 commit 0b437a2

File tree

2 files changed

+17
-0
lines changed

2 files changed

+17
-0
lines changed

docker/build.gradle

+15
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,19 @@ quickstart_configs.each { taskName, config ->
150150
}
151151
}
152152

153+
// Register all quickstart tasks
154+
quickstart_configs.each { taskName, config ->
155+
tasks.register("${taskName}BuildImages")
156+
}
157+
158+
quickstart_configs.each { taskName, config ->
159+
if (config.modules) {
160+
tasks.getByName("${taskName}BuildImages").dependsOn(
161+
config.modules.collect { it + ":${config.isDebug ? 'dockerTagDebug' : 'dockerTag'}" }
162+
)
163+
}
164+
}
165+
153166
tasks.register('minDockerCompose2.20', Exec) {
154167
executable 'bash'
155168
args '-c', 'echo -e "$(docker compose version --short)\n2.20"|sort --version-sort --check=quiet --reverse'
@@ -174,11 +187,13 @@ tasks.withType(ComposeUp).configureEach {
174187
}
175188

176189
task debugReload(type: Exec) {
190+
//TODO: Make these a set of tasks that depend on its dependency, making it a no-op if its dependency is up-to-date
177191
def cmd = ['docker compose -p datahub --profile debug'] + ['-f', compose_base] + [
178192
'restart',
179193
'datahub-gms-debug',
180194
'system-update-debug',
181195
'frontend-debug'
182196
]
183197
commandLine 'bash', '-c', cmd.join(" ")
198+
dependsOn project.tasks.named("quickstartDebugBuildImages")
184199
}

gradle/docker/docker.gradle

+2
Original file line numberDiff line numberDiff line change
@@ -160,9 +160,11 @@ project.afterEvaluate {
160160
def actualImage = _getDockerImages(tag)
161161
if (actualImage == null || actualImage.size() == 0 && imageIdFromMarker == null ||
162162
!imageIdFromMarker.startsWith(actualImage.get(0))) {
163+
logger.debug("UP-TO-DATE CHECK for ${name}: did not find image ${imageIdFromMarker}")
163164
return false
164165
}
165166
}
167+
logger.debug("UP-TO-DATE CHECK for ${name}: Is up-to-date, skipping")
166168
return true
167169
} catch (Exception e) {
168170
// any exceptions also implicitly mean not-up-to-date

0 commit comments

Comments
 (0)