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

Switch busybox over to co-maintainership #1058

Merged
merged 1 commit into from
Sep 17, 2015

Conversation

tianon
Copy link
Member

@tianon tianon commented Sep 16, 2015

Also, update it with a new version built directly from upstream's sources (instead of relying on buildroot to update their embedded copy of busybox).

cc @jpetazzo

@tianon
Copy link
Member Author

tianon commented Sep 16, 2015

Build test of #1058; 6c5ea7b (busybox):

$ url="https://raw.githubusercontent.com/docker-library/official-images/6c5ea7b84c35f58818be3cb9f46e76d2f009df69/library/busybox"
$ bashbrew build "$url"
Cloning busybox (git://github.com/docker-library/busybox) ...
Processing busybox:ubuntu-1.21.0 ...
Processing busybox:ubuntu-1.21 ...
Processing busybox:ubuntu-1 ...
Processing busybox:ubuntu ...
Processing busybox:1.23.2 ...
Processing busybox:1.23 ...
Processing busybox:1 ...
Processing busybox:latest ...
$ bashbrew list --uniq "$url" | xargs test/run.sh
testing busybox:ubuntu-1.21.0
    'utc' [1/4]...passed
    'cve-2014--shellshock' [2/4]...passed
    'no-hard-coded-passwords' [3/4]...passed
    'override-cmd' [4/4]...passed
testing busybox:1.23.2
    'utc' [1/4]...passed
    'cve-2014--shellshock' [2/4]...passed
    'no-hard-coded-passwords' [3/4]...warning: garbage password detected for 'mail': 'x'
warning: garbage password detected for 'www-data': 'x'
warning: garbage password detected for 'sys': 'x'
passed
    'override-cmd' [4/4]...passed

@tianon
Copy link
Member Author

tianon commented Sep 16, 2015

@jpetazzo do you think we should switch the ubuntu version to pull from wily instead of trusty so that it's for-sure the latest and greatest Ubuntu has to offer?

@tianon
Copy link
Member Author

tianon commented Sep 16, 2015

That would take us to 1.22.0 (from 1.21.0).

@tianon
Copy link
Member Author

tianon commented Sep 16, 2015

Maybe get this out first and then consider that separately.

@jpetazzo
Copy link
Contributor

Ah, 1.22 is always better than 1.21, but it's not 1.23...

I wouldn't mind dropping the ubuntu builder altogether if it makes maintenance easier.

(In the beginning, I had two incentives to keep it around: it was an alternative to buildroot; and it was faster... But I don't know if those criteria should still be a concern!)

@tianon
Copy link
Member Author

tianon commented Sep 16, 2015

Heh, the tarballs for it build fast enough that I'm not too worried about it for now. I'm fairly sure it's built against glibc too, so IMO it's still worth keeping around for a while longer (especially since the burden of it is low). Let's look at moving it to the Wily version in a later PR though. 👍

ubuntu-14.04: git://github.com/jpetazzo/docker-busybox@ca435164f45c40d761fad9ef9b5a76a6ba0d5f1a
ubuntu-1.21.0: git://github.com/docker-library/busybox@9018eeb5d4be894da7fa94d21346d37dbd8ee847 ubuntu
ubuntu-1.21: git://github.com/docker-library/busybox@9018eeb5d4be894da7fa94d21346d37dbd8ee847 ubuntu
ubuntu-1: git://github.com/docker-library/busybox@9018eeb5d4be894da7fa94d21346d37dbd8ee847 ubuntu
Copy link
Member

Choose a reason for hiding this comment

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

These should be swapped to be version-ubuntu, since that is the version of the software and not the version of Ubuntu.

Copy link
Member Author

@tianon tianon Sep 17, 2015 via email

Choose a reason for hiding this comment

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

Also, update it with a new version built directly from upstream's sources (instead of relying on buildroot to update their embedded copy of busybox).
@tianon
Copy link
Member Author

tianon commented Sep 17, 2015

Build test of #1058; 77200a0 (busybox):

$ url="https://raw.githubusercontent.com/docker-library/official-images/77200a03e1e7af7c7a79f015db7cc77d4eb4cd03/library/busybox"
$ bashbrew build "$url"
Fetching busybox (git://github.com/docker-library/busybox) ...
Processing busybox:1.21.0-ubuntu ...
Processing busybox:1.21-ubuntu ...
Processing busybox:1-ubuntu ...
Processing busybox:ubuntu ...
Processing busybox:1.23.2 ...
Processing busybox:1.23 ...
Processing busybox:1 ...
Processing busybox:latest ...
$ bashbrew list --uniq "$url" | xargs test/run.sh
testing busybox:1.21.0-ubuntu
    'utc' [1/4]...passed
    'cve-2014--shellshock' [2/4]...passed
    'no-hard-coded-passwords' [3/4]...passed
    'override-cmd' [4/4]...passed
testing busybox:1.23.2
    'utc' [1/4]...passed
    'cve-2014--shellshock' [2/4]...passed
    'no-hard-coded-passwords' [3/4]...warning: garbage password detected for 'mail': 'x'
warning: garbage password detected for 'www-data': 'x'
warning: garbage password detected for 'sys': 'x'
passed
    'override-cmd' [4/4]...passed

@yosifkit
Copy link
Member

LGTM

yosifkit added a commit that referenced this pull request Sep 17, 2015
Switch busybox over to co-maintainership
@yosifkit yosifkit merged commit b7fc91f into docker-library:master Sep 17, 2015
@yosifkit yosifkit deleted the busybox branch September 17, 2015 18:13
@tianon tianon mentioned this pull request Oct 2, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants