Skip to content

Commit

Permalink
Use allenh1/ros_gentoo_base for Docker (#122)
Browse files Browse the repository at this point in the history
* Pull the docker image we use for testing instead of building a fresh one (as this Dockerfile is a subset of the other).

* Remove repoman_docker
  • Loading branch information
allenh1 authored Jan 27, 2018
1 parent 0a13205 commit d7e40b9
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 16 deletions.
10 changes: 0 additions & 10 deletions repoman_docker/Dockerfile

This file was deleted.

Empty file removed repoman_docker/__init__.py
Empty file.
1 change: 0 additions & 1 deletion setup.py
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
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

0 comments on commit d7e40b9

Please sign in to comment.