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.

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

Fix workspace storage path on Docker Cloud #4931

Merged
merged 1 commit into from
May 26, 2017

Conversation

davidwindell
Copy link
Contributor

What does this PR do?

This PR fixes the problem with workspace data directories already fixed for some in #3324 but identified as not complete for all users in https://github.com/eclipse/che/blob/master/dockerfiles/che/entrypoint.sh#L310.

By using the cgroup file we can find the container's real ID without relying on the hostname (which can be changed with --hostname or by many clustering tools like Docker Cloud).

Changelog

Fix workspace storage path where hostname does not match container name

@codenvy-ci
Copy link

Can one of the admins verify this patch?

@davidwindell
Copy link
Contributor Author

Please can this be in 5.10 O:-)

@davidwindell
Copy link
Contributor Author

Ok (although this is a bug fix for 5.x and doesn't change existing scenarios).

For anyone who comes across this, you can use sed within the running che-server and then restart it to get workspace host paths working properly.

sed -i '313s/hostname/echo \$(basename "\$(head \/proc\/1\/cgroup || hostname)");/' /entrypoint.sh

@TylerJewell
Copy link

Sorry - I was leaving a comment for a different issue. This is a PR - up to Florent and other maintainers on when to merge it. This is super simple, so don't know why this wouldn't be included right away.

@riuvshin riuvshin added this to the 5.11.1 milestone May 26, 2017
@riuvshin riuvshin added the kind/bug Outline of a bug - must adhere to the bug report template. label May 26, 2017
@riuvshin riuvshin merged commit dbfb74c into eclipse-che:master May 26, 2017
riuvshin pushed a commit that referenced this pull request May 26, 2017
riuvshin pushed a commit that referenced this pull request May 29, 2017
@riuvshin riuvshin modified the milestones: 5.11.2, 5.11.1 May 29, 2017
JPinkney pushed a commit to JPinkney/che that referenced this pull request Aug 17, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/bug Outline of a bug - must adhere to the bug report template.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants