Lifecycle.java (spring-boot-2.7.3) | : | Lifecycle.java (spring-boot-2.7.4) | ||
---|---|---|---|---|
skipping to change at line 23 | skipping to change at line 23 | |||
* See the License for the specific language governing permissions and | * See the License for the specific language governing permissions and | |||
* limitations under the License. | * limitations under the License. | |||
*/ | */ | |||
package org.springframework.boot.buildpack.platform.build; | package org.springframework.boot.buildpack.platform.build; | |||
import java.io.Closeable; | import java.io.Closeable; | |||
import java.io.IOException; | import java.io.IOException; | |||
import java.util.function.Consumer; | import java.util.function.Consumer; | |||
import com.sun.jna.Platform; | ||||
import org.springframework.boot.buildpack.platform.docker.DockerApi; | import org.springframework.boot.buildpack.platform.docker.DockerApi; | |||
import org.springframework.boot.buildpack.platform.docker.LogUpdateEvent; | import org.springframework.boot.buildpack.platform.docker.LogUpdateEvent; | |||
import org.springframework.boot.buildpack.platform.docker.configuration.Resolved DockerHost; | import org.springframework.boot.buildpack.platform.docker.configuration.Resolved DockerHost; | |||
import org.springframework.boot.buildpack.platform.docker.type.Binding; | import org.springframework.boot.buildpack.platform.docker.type.Binding; | |||
import org.springframework.boot.buildpack.platform.docker.type.ContainerConfig; | import org.springframework.boot.buildpack.platform.docker.type.ContainerConfig; | |||
import org.springframework.boot.buildpack.platform.docker.type.ContainerContent; | import org.springframework.boot.buildpack.platform.docker.type.ContainerContent; | |||
import org.springframework.boot.buildpack.platform.docker.type.ContainerReferenc e; | import org.springframework.boot.buildpack.platform.docker.type.ContainerReferenc e; | |||
import org.springframework.boot.buildpack.platform.docker.type.ContainerStatus; | import org.springframework.boot.buildpack.platform.docker.type.ContainerStatus; | |||
import org.springframework.boot.buildpack.platform.docker.type.ImageReference; | import org.springframework.boot.buildpack.platform.docker.type.ImageReference; | |||
import org.springframework.boot.buildpack.platform.docker.type.VolumeName; | import org.springframework.boot.buildpack.platform.docker.type.VolumeName; | |||
skipping to change at line 204 | skipping to change at line 206 | |||
phase.withEnv("DOCKER_CERT_PATH", this.do ckerHost.getCertificatePath()); | phase.withEnv("DOCKER_CERT_PATH", this.do ckerHost.getCertificatePath()); | |||
} | } | |||
} | } | |||
else { | else { | |||
phase.withBinding(Binding.from(this.dockerHost.ge tAddress(), DOMAIN_SOCKET_PATH)); | phase.withBinding(Binding.from(this.dockerHost.ge tAddress(), DOMAIN_SOCKET_PATH)); | |||
} | } | |||
} | } | |||
else { | else { | |||
phase.withBinding(Binding.from(DOMAIN_SOCKET_PATH, DOMAIN _SOCKET_PATH)); | phase.withBinding(Binding.from(DOMAIN_SOCKET_PATH, DOMAIN _SOCKET_PATH)); | |||
} | } | |||
if (!Platform.isWindows()) { | ||||
phase.withSecurityOption("label=disable"); | ||||
} | ||||
} | } | |||
private boolean isVerboseLogging() { | private boolean isVerboseLogging() { | |||
return this.request.isVerboseLogging() && this.lifecycleVersion.i sEqualOrGreaterThan(LOGGING_MINIMUM_VERSION); | return this.request.isVerboseLogging() && this.lifecycleVersion.i sEqualOrGreaterThan(LOGGING_MINIMUM_VERSION); | |||
} | } | |||
private boolean requiresProcessTypeDefault() { | private boolean requiresProcessTypeDefault() { | |||
return this.platformVersion.supportsAny(ApiVersion.of(0, 4), ApiV ersion.of(0, 5)); | return this.platformVersion.supportsAny(ApiVersion.of(0, 4), ApiV ersion.of(0, 5)); | |||
} | } | |||
End of changes. 2 change blocks. | ||||
0 lines changed or deleted | 5 lines changed or added |