Skip to content

Commit

Permalink
Fix for using the official mysql image in composite stacks (#3049)
Browse files Browse the repository at this point in the history
* Avoid passing empty array for command and entrypoint to Docker API
* Use official mysql docker image in the java-mysql stack

Signed-off-by: Kaloyan Raev <kaloyan.r@zend.com>
  • Loading branch information
kaloyan-raev authored Dec 20, 2016
1 parent 3975d69 commit 5bb51e0
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 13 deletions.
2 changes: 1 addition & 1 deletion ide/che-core-ide-stacks/src/main/resources/stacks.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
}
},
"recipe": {
"content": "services:\n db:\n image: codenvy/mysql\n environment:\n MYSQL_DATABASE: petclinic\n MYSQL_USER: petclinic\n MYSQL_PASSWORD: password\n mem_limit: 1073741824\n dev-machine:\n image: codenvy/ubuntu_jdk8\n mem_limit: 2147483648\n depends_on:\n - db",
"content": "services:\n db:\n image: mysql\n environment:\n MYSQL_ROOT_PASSWORD: password\n MYSQL_DATABASE: petclinic\n MYSQL_USER: petclinic\n MYSQL_PASSWORD: password\n mem_limit: 1073741824\n dev-machine:\n image: codenvy/ubuntu_jdk8\n mem_limit: 2147483648\n depends_on:\n - db",
"contentType": "application/x-yaml",
"type": "compose"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,9 +130,6 @@ public ComposeServiceImpl withBuild(BuildContext build) {
* Override the default entrypoint.
*/
public List<String> getEntrypoint() {
if (entrypoint == null) {
entrypoint = new ArrayList<>();
}
return entrypoint;
}

Expand All @@ -149,9 +146,6 @@ public ComposeServiceImpl withEntrypoint(List<String> entrypoint) {
* Override the default command.
*/
public List<String> getCommand() {
if (command == null) {
command = new ArrayList<>();
}
return command;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -137,9 +137,6 @@ public CheServiceImpl withBuild(CheServiceBuildContextImpl build) {
* Override the default entrypoint.
*/
public List<String> getEntrypoint() {
if (entrypoint == null) {
entrypoint = new ArrayList<>();
}
return entrypoint;
}

Expand All @@ -156,9 +153,6 @@ public CheServiceImpl withEntrypoint(List<String> entrypoint) {
* Override the default command.
*/
public List<String> getCommand() {
if (command == null) {
command = new ArrayList<>();
}
return command;
}

Expand Down

0 comments on commit 5bb51e0

Please sign in to comment.