Skip to content
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

Jump to bottom

Add optional 'command' to Docker compose service #1294

Closed
wants to merge 2 commits into from
Closed

Add optional 'command' to Docker compose service #1294

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c7f9b5c
Add optional 'command' to Docker compose service
onobc Sep 8, 2023
8387b2d
Introduce builder Docker compose service
onobc Sep 8, 2023
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
20 changes: 18 additions & 2 deletions start-site/src/main/java/io/spring/start/site/container/DockerService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
* Description of a Docker service.
*
* @author Stephane Nicoll
* @author Chris Bono
*/
public class DockerService implements Consumer<Builder> {

Expand All @@ -33,12 +34,15 @@ public class DockerService implements Consumer<Builder> {

private final String website;

private final String command;

private final int[] ports;

DockerService(String image, String imageTag, String website, int... ports) {
DockerService(String image, String imageTag, String website, String command, int... ports) {
onobc marked this conversation as resolved.
Show resolved Hide resolved
this.image = image;
this.imageTag = imageTag;
this.website = website;
this.command = command;
this.ports = ports;
}

Expand Down Expand Up @@ -67,6 +71,14 @@ public String getWebsite() {
return this.website;
}

/**
* Return the command to use to override the default command (optional).
* @return the command
*/
public String getCommand() {
return this.command;
}

/**
* Return the ports that should be exposed by the service.
* @return the ports to expose
Expand All @@ -77,7 +89,11 @@ public int[] getPorts() {

@Override
public void accept(Builder builder) {
builder.image(this.image).imageTag(this.imageTag).imageWebsite(this.website).ports(this.ports);
builder.image(this.image)
.imageTag(this.imageTag)
.imageWebsite(this.website)
.ports(this.ports)
.command(this.command);
}

}
28 changes: 15 additions & 13 deletions start-site/src/main/java/io/spring/start/site/container/SimpleDockerServiceResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,59 +48,61 @@ public SimpleDockerServiceResolver() {
}

private static DockerService activeMQ() {
return new DockerService("symptoma/activemq", "latest", "https://hub.docker.com/r/symptoma/activemq", 61616);
return new DockerService("symptoma/activemq", "latest", "https://hub.docker.com/r/symptoma/activemq", null,
61616);
}

private static DockerService cassandra() {
return new DockerService("cassandra", "latest", "https://hub.docker.com/_/cassandra", 9042);
return new DockerService("cassandra", "latest", "https://hub.docker.com/_/cassandra", null, 9042);
}

private static DockerService elasticsearch() {
// They don't provide a 'latest' tag
return new DockerService("docker.elastic.co/elasticsearch/elasticsearch", "7.17.10",
"https://www.docker.elastic.co/r/elasticsearch", 9200, 9300);
"https://www.docker.elastic.co/r/elasticsearch", null, 9200, 9300);
}

private static DockerService kafka() {
return new DockerService("confluentinc/cp-kafka", "latest", "https://hub.docker.com/r/confluentinc/cp-kafka",
9092);
null, 9092);
}

private static DockerService mariaDb() {
return new DockerService("mariadb", "latest", "https://hub.docker.com/_/mariadb", 3306);
return new DockerService("mariadb", "latest", "https://hub.docker.com/_/mariadb", null, 3306);
}

private static DockerService mongoDb() {
return new DockerService("mongo", "latest", "https://hub.docker.com/_/mongo", 27017);
return new DockerService("mongo", "latest", "https://hub.docker.com/_/mongo", null, 27017);
}

private static DockerService mysql() {
return new DockerService("mysql", "latest", "https://hub.docker.com/_/mysql", 3306);
return new DockerService("mysql", "latest", "https://hub.docker.com/_/mysql", null, 3306);
}

private static DockerService oracle() {
return new DockerService("gvenzl/oracle-xe", "latest", "https://hub.docker.com/r/gvenzl/oracle-xe", 1521);
return new DockerService("gvenzl/oracle-xe", "latest", "https://hub.docker.com/r/gvenzl/oracle-xe", null, 1521);
}

private static DockerService postgres() {
return new DockerService("postgres", "latest", "https://hub.docker.com/_/postgres", 5432);
return new DockerService("postgres", "latest", "https://hub.docker.com/_/postgres", null, 5432);
}

private static DockerService rabbit() {
return new DockerService("rabbitmq", "latest", "https://hub.docker.com/_/rabbitmq", 5672);
return new DockerService("rabbitmq", "latest", "https://hub.docker.com/_/rabbitmq", null, 5672);
}

private static DockerService redis() {
return new DockerService("redis", "latest", "https://hub.docker.com/_/redis", 6379);
return new DockerService("redis", "latest", "https://hub.docker.com/_/redis", null, 6379);
}

private static DockerService sqlServer() {
return new DockerService("mcr.microsoft.com/mssql/server", "latest",
"https://mcr.microsoft.com/en-us/product/mssql/server/about/", 1433);
"https://mcr.microsoft.com/en-us/product/mssql/server/about/", null, 1433);
}

private static DockerService zipkin() {
return new DockerService("openzipkin/zipkin", "latest", "https://hub.docker.com/r/openzipkin/zipkin/", 9411);
return new DockerService("openzipkin/zipkin", "latest", "https://hub.docker.com/r/openzipkin/zipkin/", null,
9411);
}

@Override
Expand Down
Loading