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.

Sign up for GitHub

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

Jump to bottom

bots: Drop docker resolv.conf hack from Debian/Ubuntu images #9043

Merged
merged 6 commits into from
Apr 26, 2018
Merged

bots: Drop docker resolv.conf hack from Debian/Ubuntu images #9043

merged 6 commits into from
Apr 26, 2018

Conversation

martinpitt
Copy link
Member

@martinpitt martinpitt commented Apr 25, 2018 •
edited
Loading

Follow-up to PR #9040. That needs to land first, so this PR is blocked for now.

Also add pcp back to the debian-testing image. This isn't enabled yet, but will get the image rebuild part out of the way. PR #8968 will then make use of it.

  • image-refresh debian-stable
  • image-refresh debian-testing
  • image-refresh ubuntu-stable
  • image-refresh ubuntu-1604

@martinpitt martinpitt added the bot label Apr 25, 2018
@martinpitt martinpitt force-pushed the docker-cleanup-debian branch from a3e2a8d to 069bb6c Compare April 25, 2018 11:41
martinpitt added a commit to martinpitt/cockpit that referenced this pull request Apr 25, 2018
@martinpitt
bots: Put back pcp dependencies onto debian-testing image
069bb6c 
pcp has been back in testing for two months
(https://tracker.debian.org/pkg/pcp).

PR cockpit-project#8968 will the actually make use of it.

Closes cockpit-project#9043
@martinpitt martinpitt added the blocked Don't land until something else happens first (see task list) label Apr 25, 2018
@cockpituous
Copy link
Contributor

image-refresh in progress on cockpit-tasks-kj05m.
Log: http://fedorapeople.org/groups/cockpit/logs/image-refresh-9043-20180425-114242/

@cockpituous cockpituous changed the title bots: Drop docker resolv.conf hack from Debian/Ubuntu images WIP: cockpit-tasks-kj05m: bots: Drop docker resolv.conf hack from Debian/Ubuntu images Apr 25, 2018
@martinpitt martinpitt mentioned this pull request Apr 25, 2018
Merged
3 tasks
@martinpitt martinpitt removed the blocked Don't land until something else happens first (see task list) label Apr 25, 2018
@cockpituous
Copy link
Contributor

image-refresh debian-testing done: https://github.com/cockpituous/cockpit/commits/image-refresh-debian-testing-20180425-125757

@cockpituous cockpituous changed the title WIP: cockpit-tasks-kj05m: bots: Drop docker resolv.conf hack from Debian/Ubuntu images bots: Drop docker resolv.conf hack from Debian/Ubuntu images Apr 25, 2018
@cockpituous
Copy link
Contributor

image-refresh in progress on cockpit-tasks-0z2d6.
Log: http://fedorapeople.org/groups/cockpit/logs/image-refresh-9043-20180425-125959/

@cockpituous cockpituous changed the title bots: Drop docker resolv.conf hack from Debian/Ubuntu images WIP: cockpit-tasks-0z2d6: bots: Drop docker resolv.conf hack from Debian/Ubuntu images Apr 25, 2018
@cockpituous
Copy link
Contributor

image-refresh debian-stable done: https://github.com/cockpituous/cockpit/commits/image-refresh-debian-stable-20180425-133333

@cockpituous cockpituous changed the title WIP: cockpit-tasks-0z2d6: bots: Drop docker resolv.conf hack from Debian/Ubuntu images bots: Drop docker resolv.conf hack from Debian/Ubuntu images Apr 25, 2018
@cockpituous
Copy link
Contributor

image-refresh in progress on cockpit-tasks-0z2d6.
Log: http://fedorapeople.org/groups/cockpit/logs/image-refresh-9043-20180425-133434/

@cockpituous cockpituous changed the title bots: Drop docker resolv.conf hack from Debian/Ubuntu images WIP: cockpit-tasks-0z2d6: bots: Drop docker resolv.conf hack from Debian/Ubuntu images Apr 25, 2018
@cockpituous
Copy link
Contributor

image-refresh ubuntu-1604 done: https://github.com/cockpituous/cockpit/commits/image-refresh-ubuntu-1604-20180425-140707

@cockpituous cockpituous changed the title WIP: cockpit-tasks-0z2d6: bots: Drop docker resolv.conf hack from Debian/Ubuntu images bots: Drop docker resolv.conf hack from Debian/Ubuntu images Apr 25, 2018
@cockpituous
Copy link
Contributor

image-refresh in progress on cockpit-tasks-xbsvd.
Log: http://fedorapeople.org/groups/cockpit/logs/image-refresh-9043-20180425-140606/

@cockpituous cockpituous changed the title bots: Drop docker resolv.conf hack from Debian/Ubuntu images WIP: cockpit-tasks-xbsvd: bots: Drop docker resolv.conf hack from Debian/Ubuntu images Apr 25, 2018
@cockpituous
Copy link
Contributor

image-refresh ubuntu-1604 done: https://github.com/cockpituous/cockpit/commits/image-refresh-ubuntu-1604-20180425-143434

@cockpituous cockpituous changed the title WIP: cockpit-tasks-xbsvd: bots: Drop docker resolv.conf hack from Debian/Ubuntu images bots: Drop docker resolv.conf hack from Debian/Ubuntu images Apr 25, 2018
@cockpituous cockpituous changed the title bots: Drop docker resolv.conf hack from Debian/Ubuntu images WIP: cockpit-tasks-zrtz9: bots: Drop docker resolv.conf hack from Debian/Ubuntu images Apr 25, 2018
@cockpituous
Copy link
Contributor

image-refresh in progress on cockpit-tasks-zrtz9.
Log: http://fedorapeople.org/groups/cockpit/logs/image-refresh-9043-20180425-143535/

@cockpituous
Copy link
Contributor

image-refresh ubuntu-stable done: https://github.com/cockpituous/cockpit/commits/image-refresh-ubuntu-stable-20180425-150404

@cockpituous cockpituous changed the title WIP: cockpit-tasks-zrtz9: bots: Drop docker resolv.conf hack from Debian/Ubuntu images bots: Drop docker resolv.conf hack from Debian/Ubuntu images Apr 25, 2018
@martinpitt martinpitt force-pushed the docker-cleanup-debian branch from 069bb6c to c1917b7 Compare April 25, 2018 15:27
@larskarlitski larskarlitski merged commit 3d09e75 into cockpit-project:master Apr 26, 2018
larskarlitski pushed a commit that referenced this pull request Apr 26, 2018
@martinpitt @larskarlitski
bots: Put back pcp dependencies onto debian-testing image
eac36bb 
pcp has been back in testing for two months
(https://tracker.debian.org/pkg/pcp).

PR #8968 will the actually make use of it.

Closes #9043
@martinpitt martinpitt deleted the docker-cleanup-debian branch April 26, 2018 13:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@larskarlitski larskarlitski larskarlitski approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@martinpitt @cockpituous @larskarlitski