Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish "Add Docker Compose service connection support for OpenLDAP"

Browse Source 
See gh-39258
This commit is contained in:
Scott Frederick
2024-01-22 16:33:59 -06:00
parent eb940c3907
commit bee6fe899c
13 changed files with 56 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/testcontainers/DockerImageNames.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2023 the original author or authors.
* Copyright 2012-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -40,8 +40,6 @@ public final class DockerImageNames {
private static final String KAFKA_VERSION = "7.4.0";
private static final String LDAP_VERSION = "1.5.0";
private static final String MARIADB_VERSION = "10.10";
private static final String MONGO_VERSION = "5.0.17";
@@ -50,6 +48,8 @@ public final class DockerImageNames {
private static final String NEO4J_VERSION = "4.4.11";
private static final String OPEN_LDAP_VERSION = "1.5.0";
private static final String ORACLE_FREE_VERSION = "23.3-slim";
private static final String ORACLE_XE_VERSION = "18.4.0-slim";
@@ -122,11 +122,11 @@ public final class DockerImageNames {
}
/**
* Return a {@link DockerImageName} suitable for running OpenLdap.
* @return a docker image name for running OpenLdap
* Return a {@link DockerImageName} suitable for running OpenLDAP.
* @return a docker image name for running OpenLDAP
*/
public static DockerImageName ldap() {
return DockerImageName.parse("osixia/openldap").withTag(LDAP_VERSION);
public static DockerImageName openLdap() {
return DockerImageName.parse("osixia/openldap").withTag(OPEN_LDAP_VERSION);
}
/**

8
spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/testcontainers/LdapContainer.java → spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/testcontainers/OpenLdapContainer.java
View File

@@ -19,16 +19,16 @@ package org.springframework.boot.testsupport.testcontainers;
import org.testcontainers.containers.GenericContainer;
/**
* A {@link GenericContainer} for OpenLdap.
* A {@link GenericContainer} for OpenLDAP.
*
* @author Philipp Kessler
*/
public class LdapContainer extends GenericContainer<LdapContainer> {
public class OpenLdapContainer extends GenericContainer<OpenLdapContainer> {
private static final int DEFAULT_LDAP_PORT = 389;
public LdapContainer() {
super(DockerImageNames.ldap());
public OpenLdapContainer() {
super(DockerImageNames.openLdap());
addExposedPorts(DEFAULT_LDAP_PORT);
}