backport PR2264 into CHE-1818 branch #2288
Conversation
|
Build success. https://ci.codenvycorp.com/job/che-pullrequests-build/265/ |
|
I will merge CHE-1818 with squash. Are you ok if I'll squash theses changes too? |
| @@ -162,6 +164,11 @@ public ComposeMachineProviderImpl(DockerConnector docker, | |||
|
|
|||
| allMachinesSystemVolumes = removeEmptyAndNullValues(allMachinesSystemVolumes); | |||
| devMachineSystemVolumes = removeEmptyAndNullValues(devMachineSystemVolumes); | |||
|
|
|||
| Set<String> volumes = new HashSet<>(); | |||
| devMachineSystemVolumes.forEach((volume) -> Arrays.asList(volume.split(";")).stream().forEach((entry) -> volumes.add(entry))); | |||
There was a problem hiding this comment.
Consider usage of flatMap instead. I think that this operation can be clearer in that case.
There was a problem hiding this comment.
what if?
devMachineSystemVolumes = devMachineSystemVolumes.stream()
.map(line -> line.split(";"))
.flatMap(Arrays::stream)
.distinct()
.collect(Collectors.toSet());
|
@garagatyi and @skabashnyuk I'm ok to squash everything or not use this PR at all as long as the change about handling multiple volumes with semi colon is handled. @skabashnyuk as your solution is being more elegant, I've updated PR. |
|
Build # 272 - FAILED Please check console output at https://ci.codenvycorp.com/job/che-pullrequests-build/272/ to view the results. |
|
AFAIK now it is possible to change base branch of PR. So I think we can wait until CHE-1818 is merged and then change base branch of this PR to master and merge it to master. @benoitf WDYT? |
|
@garagatyi well current master is having the feature |
It is about allowing semi colon mounted Volumes (required for Chefile che-in-che) Change-Id: I038946a60b4b32609b276d9034be6a15756ac894 Signed-off-by: Florent BENOIT <fbenoit@codenvy.com>
benoitf
force-pushed
the
CHE-1818-backport-2264
branch
from
beaef3a to
71bf958
Compare
|
Why not to do the same for |
|
@tolusha I was not sure user was providing something for this variable |
|
It will be usefull for codenvy/codenvy#499 |
…ounted Volumes (required for Chefile che-in-che)
|
ok added |
|
Build success. https://ci.codenvycorp.com/job/che-pullrequests-build/281/ |
Allow semi colon mounted Volumes (required for Chefile che-in-che) Change-Id: I038946a60b4b32609b276d9034be6a15756ac894 Signed-off-by: Florent BENOIT <fbenoit@codenvy.com>
What does this PR do?
Backport changes of PR 2264 into CHE-1818 workspace env refactoring
What issues does this PR fix or reference?
Without this, change in master will be lost
PR type