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: Build ubuntu image and use them instead of alpine #52

Merged
merged 7 commits into from
Aug 31, 2019

Conversation

dalehamel
Copy link
Member

@dalehamel dalehamel commented Jan 28, 2019

Fix for #51 and also bumps bpftrace to 0.9.2 from ubuntu eaon

I was able to confirm that the script that doesn't work with static bpftrace works with the dynamically linked one. This is at the expense of a slightly larger (well, 3x larger), though the size here shouldn't matter too much.

As I state in #51, the preferred solution would be to fix the static alpine build (no idea how to do this), or get a static build for ubuntu working (should be possible, others are working on it).

This could at least be a stop-gap until there's a working/non-crashy static image available

@dalehamel dalehamel changed the title WIP ubuntu image build fix: WIP ubuntu image build Jan 28, 2019
@dalehamel dalehamel changed the title fix: WIP ubuntu image build fix: Build ubuntu images and use them by default Mar 24, 2019
@dalehamel
Copy link
Member Author

Looks like I broke CI with this ,will need to see what's up later (train wifi is garbage).

Testing this out locally and seems to work. My approach was to leave the alpine build, and use dependencies to target which build should actually be done in the makefile. This should allow for keeping the alpine image up to date easily.

I moved all the dockerfiles to the build directory as well.

hack/ci-build-image.sh Outdated Show resolved Hide resolved
@dalehamel
Copy link
Member Author

The commit history is ugly, i'll rebase before merging if the changes are approved.

@fntlnz fntlnz requested review from leodido and fntlnz and removed request for leodido March 24, 2019 18:23
@dalehamel dalehamel changed the title fix: Build ubuntu images and use them by default fix: Build ubuntu image and use them instead of alpine Aug 16, 2019
@dalehamel dalehamel force-pushed the ubuntu-images branch 2 times, most recently from 4438f2e to 7434747 Compare August 16, 2019 05:02
@fntlnz fntlnz self-assigned this Aug 19, 2019
@fntlnz
Copy link
Member

fntlnz commented Aug 19, 2019

Assigned to me to continue work:

Tasks:

  • pin the bpftrace version on this ubuntu image
  • rebase everything
  • make sure we ship at least bpftrace 0.9.2

fntlnz
fntlnz previously approved these changes Aug 31, 2019
@fntlnz
Copy link
Member

fntlnz commented Aug 31, 2019

@leodido PTAL

Signed-off-by: Leonardo Di Donato <[email protected]>
Copy link
Member

@leodido leodido left a comment

Choose a reason for hiding this comment

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

Thanks Dale!

This looks sooo good to me! 🎉

@leodido leodido merged commit d03517f into iovisor:master Aug 31, 2019
@dalehamel
Copy link
Member Author

Thanks guys!

@dalehamel dalehamel deleted the ubuntu-images branch August 31, 2019 17: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.

3 participants