Skip to content

configuration cache: exposeAsEnvironment/SystemProperties() #499

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 31, 2025
+11 −6
Merged

configuration cache: exposeAsEnvironment/SystemProperties() #499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion src/main/groovy/com/avast/gradle/dockercompose/ComposeSettings.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
package com.avast.gradle.dockercompose

import com.fasterxml.jackson.core.type.TypeReference
import com.fasterxml.jackson.databind.ObjectMapper
import groovy.transform.CompileStatic
import groovy.transform.PackageScope
import org.gradle.api.Project
import org.gradle.api.Task
import org.gradle.api.file.DirectoryProperty
import org.gradle.api.file.RegularFile
import org.gradle.api.file.RegularFileProperty
import org.gradle.api.provider.ListProperty
import org.gradle.api.provider.MapProperty
Expand Down Expand Up @@ -89,6 +92,8 @@ abstract class ComposeSettings {
abstract DirectoryProperty getDockerComposeWorkingDirectory()
abstract Property<Duration> getDockerComposeStopTimeout()

private final Provider<RegularFile> servicesInfosFile

@Inject
ComposeSettings(Project project, String name = '', String parentName = '') {
this.nestedName = parentName + name
Expand Down Expand Up @@ -157,6 +162,7 @@ abstract class ComposeSettings {

this.dockerExecutor = project.objects.newInstance(DockerExecutor, this)
this.tasksConfigurator = new TasksConfigurator(this, project, name)
servicesInfosFile = tasksConfigurator.upTask.flatMap { it.servicesInfosFile }
}

private static String generateSafeProjectNamePrefix(Project project) {
Expand Down Expand Up @@ -223,7 +229,11 @@ abstract class ComposeSettings {
}

Map<String, ServiceInfo> getServicesInfos() {
tasksConfigurator.getServicesInfos()
// Preserve the legacy behavior of returning an empty map if this is called before composeUp succeeds.
// composeUp.servicesInfosFile.map { ... }.get() will fail if called before composeUp completes.
// composeUp.servicesInfosFile.get() will work if called before composeUp completes.
def f = servicesInfosFile.get().asFile
f.exists() ? new ObjectMapper().readValue(f, new TypeReference<Map<String, ServiceInfo>>() {}) : [:]
}

void exposeAsEnvironment(ProcessForkOptions task) {
Expand Down
5 changes: 0 additions & 5 deletions src/main/groovy/com/avast/gradle/dockercompose/TasksConfigurator.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,11 +158,6 @@ class TasksConfigurator {
}
}

@PackageScope
Map<String, ServiceInfo> getServicesInfos() {
upTask.get().servicesInfos
}

@PackageScope
void setupMissingRequiredBy(String taskName, ComposeSettings settings) {
project.tasks
Expand Down