From fee0381c3ef7bd729629e0b45971445e053c858b Mon Sep 17 00:00:00 2001 From: Esteve Fernandez Date: Mon, 28 Mar 2022 11:14:26 +0200 Subject: [PATCH] feat(ansible/docker): add support for other Debian-based distros (#94) * feat(ansible/docker): add support for other Debian-based distros Signed-off-by: Esteve Fernandez * ci: add setup-docker.yaml Signed-off-by: Kenji Miyake Co-authored-by: Kenji Miyake --- .github/workflows/setup-docker.yaml | 16 ++++++++++++++++ ansible/roles/docker/tasks/main.yaml | 11 ++++++++--- 2 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 .github/workflows/setup-docker.yaml diff --git a/.github/workflows/setup-docker.yaml b/.github/workflows/setup-docker.yaml new file mode 100644 index 00000000..7ff8a982 --- /dev/null +++ b/.github/workflows/setup-docker.yaml @@ -0,0 +1,16 @@ +name: setup-docker + +on: + pull_request: + +jobs: + setup-docker: + runs-on: ubuntu-latest + container: ubuntu:20.04 + steps: + - name: Check out repository + uses: actions/checkout@v3 + + - name: Run setup script + run: | + ./setup-dev-env.sh -y docker diff --git a/ansible/roles/docker/tasks/main.yaml b/ansible/roles/docker/tasks/main.yaml index db057b35..73c32b71 100644 --- a/ansible/roles/docker/tasks/main.yaml +++ b/ansible/roles/docker/tasks/main.yaml @@ -34,14 +34,19 @@ - name: Save result of 'lsb_release -cs' ansible.builtin.command: lsb_release -cs - register: lsb_release + register: lsb_release_cs changed_when: false -# echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null +- name: Save result of 'lsb_release -is' + ansible.builtin.command: lsb_release -is + register: lsb_release_is + changed_when: false + +# echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/$(lsb_release -is | tr '[:upper:]' '[:lower:]') $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null - name: Add Docker apt repository to source list become: true ansible.builtin.apt_repository: - repo: deb [arch={{ deb_architecture.stdout }} signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu {{ lsb_release.stdout }} stable + repo: deb [arch={{ deb_architecture.stdout }} signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/{{ lsb_release_is.stdout | lower }} {{ lsb_release_cs.stdout }} stable filename: docker state: present update_cache: true