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

Fix apt errors on Pop!_OS #396

Merged
merged 7 commits into from
Sep 28, 2023
Merged

Fix apt errors on Pop!_OS #396

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
43b5ad4
Override defaults for Pop!_OS
dale-c-anderson Dec 30, 2022
48688d0
Handle the exception more cleanly
dale-c-anderson Dec 30, 2022
a6bab2c
Make naming more consistent
dale-c-anderson Dec 30, 2022
75b8acc
Linux Mint is also Ubuntu under the hood
dale-c-anderson Jan 24, 2023
2638529
Fix linter warning
dale-c-anderson Jan 24, 2023
0b419a0
Merge branch 'master' into 382-fix-apt-errors-on-pop-os
dale-c-anderson Aug 10, 2023
a237315
Restore snippet lost in previous conflict
dale-c-anderson Aug 10, 2023
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
7 changes: 5 additions & 2 deletions defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,13 @@
# Docker repo URL.
docker_repo_url: https://download.docker.com/linux

# Used only for Debian/Ubuntu. Switch 'stable' to 'nightly' if needed.
# Used only for Debian/Ubuntu/Pop!_OS/Linux Mint. Switch 'stable' to 'nightly' if needed.
docker_apt_release_channel: stable
# docker_apt_ansible_distribution is a workaround for Ubuntu variants which can't be identified as such by Ansible,
# and is only necessary until Docker officially supports them.
docker_apt_ansible_distribution: "{{ 'ubuntu' if ansible_distribution in ['Pop!_OS', 'Linux Mint'] else ansible_distribution }}"
docker_apt_arch: "{{ 'arm64' if ansible_architecture == 'aarch64' else 'amd64' }}"
docker_apt_repository: "deb [arch={{ docker_apt_arch }} signed-by=/etc/apt/trusted.gpg.d/docker.asc] {{ docker_repo_url }}/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} {{ docker_apt_release_channel }}"
docker_apt_repository: "deb [arch={{ docker_apt_arch }} signed-by=/etc/apt/trusted.gpg.d/docker.asc] {{ docker_repo_url }}/{{ docker_apt_ansible_distribution | lower }} {{ ansible_distribution_release }} {{ docker_apt_release_channel }}"

Check warning on line 41 in defaults/main.yml

View workflow job for this annotation

GitHub Actions / Lint 

41:201 [line-length] line too long (237 > 200 characters)
docker_apt_ignore_key_error: true
docker_apt_gpg_key: "{{ docker_repo_url }}/{{ ansible_distribution | lower }}/gpg"
docker_apt_gpg_key_checksum: "sha256:1500c1f56fa9e26b9b8f42452a553675796ade0807cdce11975eb98170b3a570"
Expand Down
Loading