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

Use allenh1/ros_gentoo_base for Docker #122

Merged
merged 3 commits into from
Jan 27, 2018
Merged

Use allenh1/ros_gentoo_base for Docker #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6b36097
Pull the docker image we use for testing instead of building a fresh …
allenh1 Jan 23, 2018
ad5a820
Remove repoman_docker
allenh1 Jan 23, 2018
60dee0d
Don't install repoman_docker, as it no longer exists.
allenh1 Jan 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions repoman_docker/Dockerfile
View file
Open in desktop

This file was deleted.

Empty file removed repoman_docker/__init__.py
View file
Open in desktop
Empty file.
1 change: 0 additions & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
license='Apache 2.0',
test_suite='tests',
data_files=[
('repoman_docker', ['repoman_docker/Dockerfile']),
('test_docker', ['tests/docker/Dockerfile']),
],
include_package_data = True,
Expand Down
14 changes: 9 additions & 5 deletions superflore/generators/ebuild/overlay_instance.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
import os
import time

from pkg_resources import resource_filename
from superflore.docker import Docker
from superflore.repo_instance import RepoInstance
from superflore.utils import info
Expand Down Expand Up @@ -44,11 +43,16 @@ def commit_changes(self, distro):
}[distro or 'update'] + time.ctime()
self.repo.git.commit(m='{0}'.format(commit_msg))

def regenerate_manifests(self, regen_dict):
info('Building docker image...')
docker_file = resource_filename('repoman_docker', 'Dockerfile')
def regenerate_manifests(
self, regen_dict, image_owner='allenh1', image_name='ros_gentoo_base'
):
info(
"Pulling docker image '%s/%s:latest'..." % (
image_owner, image_name
)
)
dock = Docker()
dock.build(docker_file)
dock.pull(image_owner, image_name)
info('Running docker image...')
info('Generating manifests...')
dock.map_directory(
Expand Down