Skip to content

improve port binding using environment variables #37

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
Feb 3, 2021
Merged

improve port binding using environment variables #37

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
8 changes: 6 additions & 2 deletions src/main/java/cloud/localstack/docker/annotation/LocalstackDockerAnnotationProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,16 @@ private LocalstackDockerConfiguration processDockerPropertiesAnnotation(Localsta
.ignoreDockerRunErrors(properties.ignoreDockerRunErrors())
.randomizePorts(properties.randomizePorts())
.imageTag(StringUtils.isEmpty(properties.imageTag()) ? null : properties.imageTag())
.portEdge(properties.portEdge())
.portElasticSearch(properties.portElasticSearch())
.portEdge(getEnvOrDefault("LOCALSTACK_EDGE_PORT", properties.portEdge()))
.portElasticSearch(getEnvOrDefault("LOCALSTACK_ELASTICSEARCH_PORT", properties.portElasticSearch()))
.useSingleDockerContainer(properties.useSingleDockerContainer())
.build();
}

private String getEnvOrDefault(final String environmentVariable, final String defaultValue) {
return System.getenv().getOrDefault(environmentVariable, defaultValue);
}

private Map<Integer, Integer> getCustomPortMappings(final LocalstackDockerProperties properties) {
final Map<Integer, Integer> portMappings = new HashMap<>();
for (String service : properties.services()) {
Expand Down
6 changes: 4 additions & 2 deletions src/main/java/cloud/localstack/docker/annotation/LocalstackDockerProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,14 @@
String imageTag() default "";

/**
* Port number for the edge service, the main entry point for all API invocations
* Port number for the edge service, the main entry point for all API invocations. Alternatively, use the
* LOCALSTACK_EDGE_PORT environment variable.
*/
String portEdge() default "4566";

/**
* Port number for the elasticsearch service
* Port number for the elasticsearch service. Alternatively, use the LOCALSTACK_ELASTICSEARCH_PORT environment
* variable.
*/
String portElasticSearch() default "4571";

Expand Down