mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Merge branch '2.6.x' into 2.7.x
Closes gh-29372
This commit is contained in:
commit
e1c84e2972
@ -128,6 +128,9 @@ log_file="$LOG_FOLDER/$LOG_FILENAME"
|
|||||||
# shellcheck disable=SC2012
|
# shellcheck disable=SC2012
|
||||||
[[ $(id -u) == "0" ]] && run_user=$(ls -ld "$jarfile" | awk '{print $3}')
|
[[ $(id -u) == "0" ]] && run_user=$(ls -ld "$jarfile" | awk '{print $3}')
|
||||||
|
|
||||||
|
# Ensure the user actually exists
|
||||||
|
id -u "$run_user" &> /dev/null || unset run_user
|
||||||
|
|
||||||
# Run as user specified in RUN_AS_USER
|
# Run as user specified in RUN_AS_USER
|
||||||
if [[ -n "$RUN_AS_USER" ]]; then
|
if [[ -n "$RUN_AS_USER" ]]; then
|
||||||
if ! [[ "$action" =~ ^(status|run)$ ]]; then
|
if ! [[ "$action" =~ ^(status|run)$ ]]; then
|
||||||
|
@ -23,7 +23,9 @@ import java.util.List;
|
|||||||
import java.util.function.Predicate;
|
import java.util.function.Predicate;
|
||||||
|
|
||||||
import org.assertj.core.api.Condition;
|
import org.assertj.core.api.Condition;
|
||||||
|
import org.slf4j.LoggerFactory;
|
||||||
import org.testcontainers.containers.GenericContainer;
|
import org.testcontainers.containers.GenericContainer;
|
||||||
|
import org.testcontainers.containers.output.Slf4jLogConsumer;
|
||||||
import org.testcontainers.containers.output.ToStringConsumer;
|
import org.testcontainers.containers.output.ToStringConsumer;
|
||||||
import org.testcontainers.containers.startupcheck.OneShotStartupCheckStrategy;
|
import org.testcontainers.containers.startupcheck.OneShotStartupCheckStrategy;
|
||||||
import org.testcontainers.images.builder.ImageFromDockerfile;
|
import org.testcontainers.images.builder.ImageFromDockerfile;
|
||||||
@ -85,6 +87,7 @@ abstract class AbstractLaunchScriptIntegrationTests {
|
|||||||
try (LaunchScriptTestContainer container = new LaunchScriptTestContainer(os, version, this.scriptsDir,
|
try (LaunchScriptTestContainer container = new LaunchScriptTestContainer(os, version, this.scriptsDir,
|
||||||
script)) {
|
script)) {
|
||||||
container.withLogConsumer(consumer);
|
container.withLogConsumer(consumer);
|
||||||
|
container.withLogConsumer(new Slf4jLogConsumer(LoggerFactory.getLogger("docker")));
|
||||||
container.start();
|
container.start();
|
||||||
while (container.isRunning()) {
|
while (container.isRunning()) {
|
||||||
Thread.sleep(100);
|
Thread.sleep(100);
|
||||||
|
@ -58,4 +58,5 @@
|
|||||||
<suppress files="DeprecatedElasticsearchRestClientProperties\.java" checks="SpringMethodVisibility" />
|
<suppress files="DeprecatedElasticsearchRestClientProperties\.java" checks="SpringMethodVisibility" />
|
||||||
<suppress files="DeprecatedReactiveElasticsearchRestClientProperties\.java" checks="SpringMethodVisibility" />
|
<suppress files="DeprecatedReactiveElasticsearchRestClientProperties\.java" checks="SpringMethodVisibility" />
|
||||||
<suppress files="DevToolsR2dbcAutoConfigurationTests" checks="HideUtilityClassConstructor" />
|
<suppress files="DevToolsR2dbcAutoConfigurationTests" checks="HideUtilityClassConstructor" />
|
||||||
|
<suppress files="AbstractLaunchScriptIntegrationTests" checks="IllegalImport" />
|
||||||
</suppressions>
|
</suppressions>
|
||||||
|
Loading…
Reference in New Issue
Block a user