Skip to content

Commit

Permalink
Revert "Move db initilization to shell script"
Browse files Browse the repository at this point in the history
This reverts commit 224ac0d.
  • Loading branch information
bonicim committed Jul 20, 2020
1 parent 224ac0d commit 0767c38
Show file tree
Hide file tree
Showing 4 changed files with 244 additions and 216 deletions.
5 changes: 2 additions & 3 deletions volttrontesting/fixtures/docker_wrapper.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

@contextlib.contextmanager
def create_container(image_name: str, ports: dict = None, env: dict = None, command: (list, str) = None,
volumes: (dict, list) = None, startup_time_seconds: int = 30) -> \
startup_time_seconds: int = 30) -> \
(docker.models.containers.Container, None):
""" Creates a container instance in a context that will clean up after itself.
Expand Down Expand Up @@ -54,8 +54,7 @@ def create_container(image_name: str, ports: dict = None, env: dict = None, comm
# So all tags aren't pulled. According to docs https://docker-py.readthedocs.io/en/stable/images.html.
full_docker_image = full_docker_image + ":latest"
client.images.pull(full_docker_image)
container = client.containers.run(image_name, ports=ports, environment=env, auto_remove=True, detach=True,
volumes=volumes)
container = client.containers.run(image_name, ports=ports, environment=env, auto_remove=True, detach=True)
except (ImageNotFound, APIError, RuntimeError) as e:
raise RuntimeError(e)

Expand Down

This file was deleted.

This file was deleted.

Loading

0 comments on commit 0767c38

Please sign in to comment.