Skip to content

Commit c0598a7

Browse files
committed
Replace library/busybox with lighter container repo
1 parent 1ec9a10 commit c0598a7

3 files changed

Lines changed: 6 additions & 4 deletions

File tree

conf/container.yaml.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ CONTAINER:
44
- docker
55
- podman
66
REGISTRY_HUB: https://mirror.gcr.io
7-
UPSTREAM_NAME: 'library/busybox'
7+
UPSTREAM_NAME: jmalloc/echo-server
88
ALTERNATIVE_UPSTREAM_NAMES:
99
- hello-world
1010
- alpine

robottelo/config/validators.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119
'container.upstream_name',
120120
must_exist=True,
121121
is_type_of=str,
122-
default='library/busybox',
122+
default='jmalloc/echo-server',
123123
),
124124
Validator(
125125
'container.alternative_upstream_names',

tests/foreman/cli/test_container_management.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,14 +94,16 @@ def test_positive_pull_image(
9494
)
9595
assert result.status == 0
9696
try:
97-
result = module_container_contenthost.execute(f'docker run {repo["published-at"]}')
97+
result = module_container_contenthost.execute(
98+
f'docker run -d {repo["published-at"]}'
99+
)
98100
assert result.status == 0
99101
finally:
100102
# Stop and remove the container
101103
result = module_container_contenthost.execute(
102104
f'docker ps -a | grep {repo["published-at"]}'
103105
)
104-
container_id = result.stdout[0].split()[0]
106+
container_id = result.stdout.split()[0]
105107
module_container_contenthost.execute(f'docker stop {container_id}')
106108
module_container_contenthost.execute(f'docker rm {container_id}')
107109
finally:

0 commit comments

Comments
 (0)