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

Modifying Dockerfile.amd64 to use debian instead of alpine as base #202

Conversation

Projects
None yet
3 participants
@stevegaossou
Copy link
Contributor

commented Mar 25, 2019

Description

Modifying Dockerfiles to use debian instead of alpine as base for copying over dependencies.

Todos

  • Tests
    • Ensure all existing tests are passing
  • Documentation
    • Add something to README.md about testing Calico node
  • Release note

Release Note

amd64 images now use debian instead of alpine as base
@stevegaossou

This comment has been minimized.

Copy link
Contributor Author

commented Mar 28, 2019

All System Tests (make ci) are green now. ☝️

Only remaining blocker is to fix the k8s tests (make k8s-test) which is a much smaller batch.

Show resolved Hide resolved Makefile Outdated
@stevegaossou

This comment has been minimized.

Copy link
Contributor Author

commented Mar 29, 2019

Omg, it's green!

Have to add back the ci tests now.

@stevegaossou

This comment has been minimized.

Copy link
Contributor Author

commented Mar 29, 2019

Finally ... all tests passing 🙏

Show resolved Hide resolved Makefile

@stevegaossou stevegaossou changed the title [WIP] Modifying Dockerfiles to use debian instead of alpine as base Modifying Dockerfile.amd64 to use debian instead of alpine as base Apr 2, 2019

@stevegaossou

This comment has been minimized.

Copy link
Contributor Author

commented Apr 2, 2019

This one is finally ready 4 review.

cc @caseydavenport

@caseydavenport
Copy link
Member

left a comment

Awesome work @stevegaossou - especially thanks for the README updates!

This looks good to me - just a few minor README comments, and then if you could squash your commits I'll press the ol' merge button.

Show resolved Hide resolved README.md Outdated
Show resolved Hide resolved README.md Outdated
Show resolved Hide resolved README.md Outdated

@stevegaossou stevegaossou force-pushed the stevegaossou:os-3939-base-image-refactor branch from eb3751d to 35bec03 Apr 3, 2019

@CLAassistant

This comment has been minimized.

Copy link

commented Apr 3, 2019

CLA assistant check
All committers have signed the CLA.

@stevegaossou

This comment has been minimized.

Copy link
Contributor Author

commented Apr 3, 2019

This looks good to me - just a few minor README comments, and then if you could squash your commits I'll press the ol' merge button.

I did a rebase and force-pushed my stuff. I collapsed it into two separate commits (because my commits were interleaved with some other ones). I did dry-run test merge into master locally and it went okay. But it seems to have messed up the CLA signing step (since now it thinks there's a commit from marvin-tigera).

I'm still waiting on official 👍 from product before we merge this. I'll ping @caseydavenport once I get confirmation.

@caseydavenport

This comment has been minimized.

Copy link
Member

commented Apr 4, 2019

@stevegaossou hrm, not sure how that happened - it shouldn't have any of the marvin commits in it.

What process did you use to rebase?

@stevegaossou

This comment has been minimized.

Copy link
Contributor Author

commented Apr 4, 2019

@stevegaossou hrm, not sure how that happened - it shouldn't have any of the marvin commits in it.
What process did you use to rebase?

I did a git rebase -i HEAD~16 (where I had 16 commit originally on this branch).

I think the problem was that I had done regular merge downs from master so when I when to collapse everything the history was interleaved with commits from master.

Here's what it looked like, when I did interactive rebase:

# My first set of changes below
pick 30d2d89 Switching node base image from alpine to debian.
squash 6e36c2c Bumping up the version of Debian to Buster-slim (to avoid CVEs and ensure versions of ipset, iptables, etc match or are newer than alpine:3.8).
squash 4760af0 Trying to switch iptables 1.8.2 to use legacy mode instead of nftables mode (which is the new default).
squash 63fad39 Moving back to debian 9.8-slim, as buster-slim (even using legacy iptables commands) breaks the BGP tests (iptables-save errors out).
squash 7f52205 Switching back to debian:buster-slim, also adding kmod package to resolve problem with ip6tables-save.
squash aa560ba Adding another felix dependency.
squash 44fd179 Adding another felix dependency (this time to get arp).
squash d86cde4 Disabling CI tests temporarily to debug CI issues with k8s-tests.

pick 474c9e9 Automated pin updates
pick 6c4e343 Avoid apparent pyyaml vulnerability
pick 71979dd Automated pin updates
pick d9c840e Automated pin updates
pick 9a3ad99 Automated pin updates

# My second set of changes below
pick 9b5046b Adding flag and target to remove Go build image from machine, needed for Semaphore CI (where disk space is a real issue during k8s-test).
squash 864f9ee Adding CI tests back.
squash 3a9e60b Adding some documentation for running tests for Calico Node.
squash b694f2d Adding in dependencies section to documentation.
squash 9ecda90 Making some corrections to documentation based on feedback.

pick 1ef3c1a Automated pin updates
pick e5fc2cb Stop printing log to stdout in main

# Rebase f8ee453..eb3751d onto f8ee453 (20 commands)
#
# Commands:
# p, pick = use commit
# r, reword = use commit, but edit the commit message
# e, edit = use commit, but stop for amending
# s, squash = use commit, but meld into previous commit
# f, fixup = like "squash", but discard this commit's log message
# x, exec = run command (the rest of the line) using shell
# d, drop = remove commit
#
# These lines can be re-ordered; they are executed from top to bottom.
#
# If you remove a line here THAT COMMIT WILL BE LOST.
#
# However, if you remove everything, the rebase will be aborted.
#
# Note that empty commits are commented out

I have a backup version of this branch that is unchanged. So I can try this again and force push it.

But I don't think the results will be different if I use rebase again.

@stevegaossou stevegaossou force-pushed the stevegaossou:os-3939-base-image-refactor branch 2 times, most recently from eb3751d to 722a84c Apr 4, 2019

@stevegaossou stevegaossou force-pushed the stevegaossou:os-3939-base-image-refactor branch from 722a84c to 26ce585 Apr 4, 2019

@caseydavenport caseydavenport merged commit 94d0f35 into projectcalico:master Apr 5, 2019

2 checks passed

license/cla Contributor License Agreement is signed.
Details
semaphoreci The build passed on Semaphore.
Details

@stevegaossou stevegaossou deleted the stevegaossou:os-3939-base-image-refactor branch Apr 5, 2019

@caseydavenport caseydavenport added this to the Calico v3.7.0 milestone Apr 5, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.