ansible-collections/community.docker
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.docker.git synced 2026-03-15 19:58:28 +00:00
Code Packages Projects Releases Wiki Activity

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

Browse Source 
* Use our image for container platform test.

* Remove docker_test_image_hello_world_platform image.
This commit is contained in:
Felix Fontein 2024-07-08 09:27:27 +02:00 committed by GitHub
parent f9461bb441
commit 8e8a091469
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tests/integration/targets/docker_container/tasks/tests/options.yml
View File

@ -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
@ -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
@ -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
@ -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
@ -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
@ -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

1
tests/integration/targets/setup_docker/vars/main.yml
View File

@ -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