mesosphere / net-modules

Apache Mesos modules for network isolation.
55 stars 28 forks source link

Isolate calico files #48

Closed ozdanborne closed 9 years ago

ozdanborne commented 9 years ago

@karya0 does net-modules.spec need updating?

karya0 commented 9 years ago

I have a high-level question: why move isolator to isolator/isolator? I was imagining more like a top-level calico directory and calico specific bits in there without changing anything related to isolator.

ozdanborne commented 9 years ago

@karya0 A lot of the isolator specific code was scattered around the project's root directory, and moved around during the docker build. I moved it into an isolator folder so that the docker build steps could be reduced from

ADD ./isolator /isolator/isolator/
ADD ./m4 /isolator/m4/
ADD ./bootstrap /isolator/
ADD ./calico_isolator /isolator/
ADD ./configure.ac /isolator/
ADD ./Makefile.am /isolator/

to :

ADD ./isolator/ /isolator/

Now the isolator code is organized in the git repo the same way it is organized at build time.

ConnorDoyle commented 9 years ago

@djosborne the simplifications you made in docker-compose.yml are welcome, I'm just concerned they may compromise the demo. Before I try to fire it up, were you able to verify that these changes didn't break anything?

ozdanborne commented 9 years ago

@ConnorDoyle I will confirm that the demo still works. (I was working on too many branches at once, I don't think I reran it before I submitted this PR)

spikecurtis commented 9 years ago

LGTM!

ConnorDoyle commented 9 years ago

Yep, :shipit: