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

Jump to bottom

Verify correct docker version is installed and the Container Service is running #107

Merged
merged 7 commits into from
May 24, 2024
Merged

Verify correct docker version is installed and the Container Service is running #107

merged 7 commits into from
May 24, 2024

Conversation

p-j-smith
Copy link
Contributor

@p-j-smith p-j-smith commented May 24, 2024 •
edited
Loading

Fixes #68
Fixes #70

  • add docker_version variable
  • verify Docker server and client versions are correct
  • verify the Container Service is running
  • verify an image can be added to the Container Service

@p-j-smith
Verify correct docker version is installed
072c0bb 
And that the container service is running and an image can be uploaded
@p-j-smith p-j-smith requested a review from a team May 24, 2024 09:41
@paddyroddy paddyroddy self-requested a review May 24, 2024 10:07
@p-j-smith p-j-smith enabled auto-merge (squash) May 24, 2024 10:19
@p-j-smith p-j-smith disabled auto-merge May 24, 2024 10:40
@p-j-smith p-j-smith requested a review from paddyroddy May 24, 2024 10:46
paddyroddy
paddyroddy reviewed May 24, 2024
View reviewed changes
roles/docker/README.md Outdated Show resolved Hide resolved
roles/docker/defaults/main.yml Outdated Show resolved Hide resolved
paddyroddy
paddyroddy reviewed May 24, 2024
View reviewed changes
roles/docker/tasks/main.yml
Comment on lines +39 to +41
- docker-ce{{ "" if docker_version == "latest" else "-" ~ docker_version }}
- docker-ce-cli{{ "" if docker_version == "latest" else "-" ~ docker_version
}}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hilarious syntax 😛

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ha I know! Another option would be:

- "{{ docker-ce if docker_version == 'latest' else 'docker-ce-{}'.format(docker_version) }}"

both are pretty cumbersome

playbooks/molecule/resources/xnat/inventory/group_vars/container_service.yml Outdated Show resolved Hide resolved
@p-j-smith p-j-smith requested a review from paddyroddy May 24, 2024 13:09
paddyroddy
paddyroddy approved these changes May 24, 2024
View reviewed changes
Copy link
Member

@paddyroddy paddyroddy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, I didn't get a notification for the last review request. Thanks for doing this!

@p-j-smith p-j-smith merged commit 86cd02b into main May 24, 2024
5 checks passed
@p-j-smith p-j-smith deleted the test/container-service branch May 24, 2024 15:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@paddyroddy paddyroddy paddyroddy approved these changes

@HChughtai HChughtai Awaiting requested review from HChughtai

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Add tests to make sure the container service is actually running Add variables to control docker versions
3 participants
@p-j-smith @paddyroddy @HChughtai