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 for --excludedocs build errors in C5 #188

Merged
merged 2 commits into from
Sep 8, 2014

Conversation

jperrin
Copy link
Contributor

@jperrin jperrin commented Sep 6, 2014

CentOS5 images have an issue building with --excludedocs. This updated image resolves the issue.

@tianon
Copy link
Member

tianon commented Sep 8, 2014

LGTM

root@55c0e1d78b84:/stackbrew/stackbrew# ./brew-cli --debug --no-namespace -b master --targets centos git://github.com/CentOS/official-images
2014-09-08 17:04:00,395 DEBUG Cloning repo_url=git://github.com/CentOS/official-images, ref=master
2014-09-08 17:04:00,397 DEBUG folder = /tmp/tmp73wwZg
2014-09-08 17:04:00,397 DEBUG Cloning git://github.com/CentOS/official-images into /tmp/tmp73wwZg
2014-09-08 17:04:00,397 DEBUG Executing "git clone git://github.com/CentOS/official-images ." in /tmp/tmp73wwZg
Cloning into '.'...
remote: Counting objects: 1331, done.
remote: Compressing objects: 100% (13/13), done.
remote: Total 1331 (delta 5), reused 1 (delta 0)
Receiving objects: 100% (1331/1331), 194.28 KiB | 118.00 KiB/s, done.
Resolving deltas: 100% (751/751), done.
Checking connectivity... done.
2014-09-08 17:04:01,774 DEBUG Checkout ref:master in /tmp/tmp73wwZg
2014-09-08 17:04:01,774 DEBUG Executing "git checkout master" in /tmp/tmp73wwZg
Already on 'master'
Your branch is up-to-date with 'origin/master'.
2014-09-08 17:04:01,780 DEBUG latest: git://github.com/CentOS/sig-cloud-instance-images@f7732ef53029d6adfbadb7069c6666528e5c6d0e docker

2014-09-08 17:04:01,780 DEBUG centos7: git://github.com/CentOS/sig-cloud-instance-images@f7732ef53029d6adfbadb7069c6666528e5c6d0e docker

2014-09-08 17:04:01,780 DEBUG centos6: git://github.com/CentOS/sig-cloud-instance-images@e1ea1c01abea5f402c650caf12049a711373b27a docker

2014-09-08 17:04:01,780 DEBUG centos5: git://github.com/CentOS/sig-cloud-instance-images@7d888ae1b0d55a893129a1039d946e42c3573afa docker

2014-09-08 17:04:01,781 DEBUG centos: latest,centos7
2014-09-08 17:04:01,781 DEBUG centos: centos6
2014-09-08 17:04:01,781 DEBUG centos: centos5
2014-09-08 17:04:01,781 DEBUG Cloning repo_url=git://github.com/CentOS/sig-cloud-instance-images, ref=f7732ef53029d6adfbadb7069c6666528e5c6d0e
2014-09-08 17:04:01,781 DEBUG folder = /tmp/tmpKGJft2
2014-09-08 17:04:01,781 DEBUG Cloning git://github.com/CentOS/sig-cloud-instance-images into /tmp/tmpKGJft2
2014-09-08 17:04:01,781 DEBUG Executing "git clone git://github.com/CentOS/sig-cloud-instance-images ." in /tmp/tmpKGJft2
Cloning into '.'...
remote: Counting objects: 24, done.
remote: Compressing objects: 100% (21/21), done.
remote: Total 24 (delta 3), reused 21 (delta 1)
Receiving objects: 100% (24/24), 118.07 MiB | 618.00 KiB/s, done.
Resolving deltas: 100% (3/3), done.
Checking connectivity... done.
2014-09-08 17:06:26,196 DEBUG Checkout ref:f7732ef53029d6adfbadb7069c6666528e5c6d0e in /tmp/tmpKGJft2
2014-09-08 17:06:26,196 DEBUG Executing "git checkout f7732ef53029d6adfbadb7069c6666528e5c6d0e" in /tmp/tmpKGJft2
Note: checking out 'f7732ef53029d6adfbadb7069c6666528e5c6d0e'.

You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
state without impacting any branches by performing another checkout.

If you want to create a new branch to retain commits you create, you may
do so (now or later) by using -b with the checkout command again. Example:

  git checkout -b new_branch_name

HEAD is now at f7732ef... update centos7 image
2014-09-08 17:06:26,313 INFO Build start: centos ('git://github.com/CentOS/sig-cloud-instance-images', 'f7732ef53029d6adfbadb7069c6666528e5c6d0e', 'docker')
2014-09-08 17:06:35,285 INFO Build success: 6183a988c0c9 (centos:latest)
2014-09-08 17:06:35,311 INFO Build success: 6183a988c0c9 (centos:centos7)
2014-09-08 17:06:35,323 DEBUG Checkout ref:e1ea1c01abea5f402c650caf12049a711373b27a in /tmp/tmpKGJft2
2014-09-08 17:06:35,323 DEBUG Executing "git checkout e1ea1c01abea5f402c650caf12049a711373b27a" in /tmp/tmpKGJft2
Previous HEAD position was f7732ef... update centos7 image
HEAD is now at e1ea1c0... update centos6 image
2014-09-08 17:06:35,576 INFO Build start: centos ('git://github.com/CentOS/sig-cloud-instance-images', 'e1ea1c01abea5f402c650caf12049a711373b27a', 'docker')
2014-09-08 17:06:44,582 INFO Build success: 19f6323c1bb4 (centos:centos6)
2014-09-08 17:06:44,617 DEBUG Checkout ref:7d888ae1b0d55a893129a1039d946e42c3573afa in /tmp/tmpKGJft2
2014-09-08 17:06:44,617 DEBUG Executing "git checkout 7d888ae1b0d55a893129a1039d946e42c3573afa" in /tmp/tmpKGJft2
Previous HEAD position was e1ea1c0... update centos6 image
HEAD is now at 7d888ae... fix --excludedocs
2014-09-08 17:06:44,859 INFO Build start: centos ('git://github.com/CentOS/sig-cloud-instance-images', '7d888ae1b0d55a893129a1039d946e42c3573afa', 'docker')
2014-09-08 17:07:05,606 INFO Build success: 0d1b8480f57e (centos:centos5)

yosifkit added a commit that referenced this pull request Sep 8, 2014
fix for --excludedocs build errors in C5
@yosifkit yosifkit merged commit 8060b4b into docker-library:master Sep 8, 2014
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.

3 participants