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

[WIP] CHE-120 Workspace creation as non-privileged container #4349

Merged
merged 1 commit into from
Mar 8, 2017

Conversation

ibuziuk
Copy link
Member

@ibuziuk ibuziuk commented Mar 7, 2017

What issues does this PR fix or reference?

https://issues.jboss.org/browse/CHE-120

Changelog

CHE-120 Workspace creation as non-privileged container

@codenvy-ci
Copy link

Can one of the admins verify this patch?

@ibuziuk
Copy link
Member Author

ibuziuk commented Mar 7, 2017

@l0rd am I correct that the plan is renaming stacks.json.centos to stacks.json before build e.g. we are planning to leave stacks.json without modifications

@ibuziuk
Copy link
Member Author

ibuziuk commented Mar 7, 2017

FYI, I have also created an issue for publishing images to registry.centos.org from openshift-connector branch https://issues.jboss.org/browse/CHE-152

Copy link
Contributor

@l0rd l0rd left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you @ibuziuk ! Some comments:

  • stacks.json should not be modified, we are adding "modified" images just in stacks.json.centos
  • When modifying file org.eclipse.che.ws-agent.script.sh you should modify org.eclipse.che.ws-agent.json
  • Instead of removing the sudo commands you could add and if condition that checks if the folder already exists (if the folder already exists the sudo command is not executed). With this approach other stacks will continue working.

…ctions for '/project' dir creation and package installation from ws-agent script to Dockerfile.

Signed-off-by: Ilya Buziuk <ibuziuk@redhat.com>
@ibuziuk
Copy link
Member Author

ibuziuk commented Mar 8, 2017

@l0rd Thanks for review. PR has been updated

stacks.json should not be modified, we are adding "modified" images just in stacks.json.centos

So, we are going to have smth. like that in build instructions :

cd ide/che-core-ide-stacks/src/main/resources
mv stacks.json stacks.json.orig
cp stacks.json.centos stacks.json
cd ../../../../
mvn clean install

cd ide/che-core-ide-stacks/src/main/resources
mv stacks.json.orig  stacks.json
cd ../../../../

?

When modifying file org.eclipse.che.ws-agent.script.sh you should modify org.eclipse.che.ws-agent.json

Hmmm.. do not really understand why this should be done. org.eclipse.che.ws-agent.json is just an agen's metadata - I can not figure out what should be changed there

Instead of removing the sudo commands you could add and if condition that checks if the folder already exists (if the folder already exists the sudo command is not executed). With this approach other stacks will continue working.

Good point - fixed

@l0rd
Copy link
Contributor

l0rd commented Mar 8, 2017

Hmmm.. do not really understand why this should be done. org.eclipse.che.ws-agent.json is just an agen's metadata - I can not figure out what should be changed there

You are right. A few months ago the shell script was duplicated in a json file but that should have been fixed now.

@l0rd l0rd merged commit f4923c0 into eclipse-che:openshift-connector Mar 8, 2017
@JamesDrummond JamesDrummond added this to the 5.5.0 milestone Mar 17, 2017
@JamesDrummond JamesDrummond mentioned this pull request Mar 17, 2017
9 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants