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

Enable SCL globally without sourcing bashrc #35

Merged
merged 3 commits into from
Jun 10, 2015
Merged

Conversation

mfojtik
Copy link
Contributor

@mfojtik mfojtik commented Jun 10, 2015

This PR enables the SCL collections globally by using BASH_ENV to inject the scl enable to every /bin/bash session.

This require change to every image we have, so don't merge it on its own, this have to be merged together with other PR's I will link to this PR.

mfojtik and others added 3 commits June 10, 2015 10:10
@mfojtik
Copy link
Contributor Author

mfojtik commented Jun 10, 2015

FYI: The tests will fail for all those images without the change in sti-base. I'm testing all PR's manually using make test.

@mfojtik
Copy link
Contributor Author

mfojtik commented Jun 10, 2015

@bparees @mnagy @rhcarvalho @soltysh @jhadvig guys, can I ask you to just double-check if I didn't miss something in all this copy & pasting? I ran make test for every repo we have with success.

Also I just want to make you aware of this change. This means that we no longer need to source .bashrc in any script and the SCL should be enabled automatically in every bash session.

Additionally I added SKIP_SQUASH=1 option for make build so you can skip squashing which is extremely painful when doing local development. Also I disabled squashing for the 'candidate' image that we build for the test. This should speed up the Jenkins jobs, with assumption that the squash will not screw the content (we believe @goldmann! :)

@hhorak can you please confirm that using BASH_ENV this way won't break anything? So far all our tests are passing (including the full examples we have in openshift org).

@mfojtik mfojtik changed the title [DO_NOT_MERGE] Enable SCL globally without sourcing bashrc Enable SCL globally without sourcing bashrc Jun 10, 2015
@mnagy
Copy link
Contributor

mnagy commented Jun 10, 2015

LGTM

@rhcarvalho
Copy link
Contributor

LGTM, love the SKIP_SQUASH.

@mfojtik
Copy link
Contributor Author

mfojtik commented Jun 10, 2015

I should probably put a fat warning to every .bashrc saying that you should NOT add more stuff there as it will be run everytime you execute the bash itself. This can be nasty and for example in sti-python we do the arbitrary user magic in that file. This magic will be execute everytime you run bash. We should probably move that into separate file and source it just in run script as I think that it is the only place where we do care about setting the arbitrary user.

@mfojtik
Copy link
Contributor Author

mfojtik commented Jun 10, 2015

(warning added), got 2 lgtm, merging this.

mfojtik pushed a commit that referenced this pull request Jun 10, 2015
Enable SCL globally without sourcing bashrc
@mfojtik mfojtik merged commit 64f540b into sclorg:master Jun 10, 2015
@soltysh
Copy link
Contributor

soltysh commented Jun 10, 2015

Nicely done @mfojtik !

@mfojtik mfojtik deleted the bash-env branch August 25, 2015 09:39
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