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

Get rid of hello-world image, 2/2 #925

Merged
merged 2 commits into from
Jul 8, 2024
Merged

Get rid of hello-world image, 2/2 #925

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b2d49e0
Use our image for container platform test.
felixfontein Jul 8, 2024
73f88f6
Remove docker_test_image_hello_world_platform image.
felixfontein Jul 8, 2024
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
16 changes: 8 additions & 8 deletions tests/integration/targets/docker_container/tasks/tests/options.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3605,13 +3605,13 @@ avoid such warnings, please quote the value.' in (log_options_2.warnings | defau
## platform ########################################################
####################################################################

- name: Remove hello-world image
- name: Remove test image
docker_image_remove:
name: "{{ docker_test_image_hello_world_platform }}"
name: "{{ docker_test_image_simple_1 }}"

- name: platform
docker_container:
image: "{{ docker_test_image_hello_world_platform }}"
image: "{{ docker_test_image_simple_1 }}"
name: "{{ cname }}"
state: present
pull: true
Expand All @@ -3624,7 +3624,7 @@ avoid such warnings, please quote the value.' in (log_options_2.warnings | defau
# Docker daemon only returns 'linux' as the platform for the container,
# so this has to be handled correctly by our additional code
docker_container:
image: "{{ docker_test_image_hello_world_platform }}"
image: "{{ docker_test_image_simple_1 }}"
name: "{{ cname }}"
state: present
platform: linux/amd64
Expand All @@ -3634,7 +3634,7 @@ avoid such warnings, please quote the value.' in (log_options_2.warnings | defau

- name: platform (idempotency with shorter name)
docker_container:
image: "{{ docker_test_image_hello_world_platform }}"
image: "{{ docker_test_image_simple_1 }}"
name: "{{ cname }}"
state: present
platform: linux
Expand All @@ -3644,7 +3644,7 @@ avoid such warnings, please quote the value.' in (log_options_2.warnings | defau

- name: platform (idempotency with shorter name)
docker_container:
image: "{{ docker_test_image_hello_world_platform }}"
image: "{{ docker_test_image_simple_1 }}"
name: "{{ cname }}"
state: present
platform: amd64
Expand All @@ -3654,7 +3654,7 @@ avoid such warnings, please quote the value.' in (log_options_2.warnings | defau

- name: platform (changed)
docker_container:
image: "{{ docker_test_image_hello_world_platform }}"
image: "{{ docker_test_image_simple_1 }}"
name: "{{ cname }}"
state: present
pull: true
Expand All @@ -3669,7 +3669,7 @@ avoid such warnings, please quote the value.' in (log_options_2.warnings | defau

- name: platform (idempotency)
docker_container:
image: "{{ docker_test_image_hello_world_platform }}"
image: "{{ docker_test_image_simple_1 }}"
name: "{{ cname }}"
state: present
pull: true
Expand Down
1 change: 0 additions & 1 deletion tests/integration/targets/setup_docker/vars/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ docker_test_image_digest_base: quay.io/ansible/docker-test-containers
docker_test_image_hello_world: quay.io/ansible/docker-test-containers:hello-world
docker_test_image_hello_world_image_id: sha256:bf756fb1ae65adf866bd8c456593cd24beb6a0a061dedf42b26a993176745f6b
docker_test_image_hello_world_base: quay.io/ansible/docker-test-containers
docker_test_image_hello_world_platform: docker.io/library/hello-world:latest
docker_test_image_busybox: quay.io/ansible/docker-test-containers:busybox
docker_test_image_alpine: quay.io/ansible/docker-test-containers:alpine3.8
docker_test_image_alpine_different: quay.io/ansible/docker-test-containers:alpine3.7
Expand Down
Loading