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

docker-opengl centos branch rebased #11

Open
wants to merge 7 commits into
base: centos
Choose a base branch
from

Conversation

MayeulChassagnard
Copy link
Contributor

Can't automatically merge because the centos branch needs to be update with the master branch modifications (Makefile, etc.)

CC: @thewtex @jcfr

thewtex and others added 6 commits October 20, 2016 17:05
This useful image have been created to be used for Slicer CI.

Because the slicer build tree docker image (slicer/slicer-build) is based
on centos 5, then we have to run the test on centos 5 if we don't want to
rebuild everything and just share the volume which contains the build tree.
ENH: Newer version of Dockerfile required for CircleCI to support 'ARG'
@thewtex
Copy link
Owner

thewtex commented Oct 24, 2016

I am merging master into centos, then the rebase and PR should work better...

@thewtex
Copy link
Owner

thewtex commented Oct 24, 2016

I have updated the centos branch by merging from master. Please rebase by cherry-picking this patch on centos. Let's use thewtex/opengl:centos for the images on this branch for now.

@MayeulChassagnard
Copy link
Contributor Author

Perhaps it would have been better to just set the centos branch on the same commit history as the master branch because there is lot of conflicts..
I'm still trying to rebase+cherry-pick..

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.

2 participants