Skip to content

Commit fee0381

Browse files
esteveKenji Miyake
and
Kenji Miyake
authored
feat(ansible/docker): add support for other Debian-based distros (autowarefoundation#94)
* feat(ansible/docker): add support for other Debian-based distros Signed-off-by: Esteve Fernandez <esteve.fernandez@tier4.jp> * ci: add setup-docker.yaml Signed-off-by: Kenji Miyake <kenji.miyake@tier4.jp> Co-authored-by: Kenji Miyake <kenji.miyake@tier4.jp>
1 parent 4245f9c commit fee0381

File tree

2 files changed

+24
-3
lines changed

2 files changed

+24
-3
lines changed

.github/workflows/setup-docker.yaml

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
name: setup-docker
2+
3+
on:
4+
pull_request:
5+
6+
jobs:
7+
setup-docker:
8+
runs-on: ubuntu-latest
9+
container: ubuntu:20.04
10+
steps:
11+
- name: Check out repository
12+
uses: actions/checkout@v3
13+
14+
- name: Run setup script
15+
run: |
16+
./setup-dev-env.sh -y docker

ansible/roles/docker/tasks/main.yaml

+8-3
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,19 @@
3434

3535
- name: Save result of 'lsb_release -cs'
3636
ansible.builtin.command: lsb_release -cs
37-
register: lsb_release
37+
register: lsb_release_cs
3838
changed_when: false
3939

40-
# 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
40+
- name: Save result of 'lsb_release -is'
41+
ansible.builtin.command: lsb_release -is
42+
register: lsb_release_is
43+
changed_when: false
44+
45+
# 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
4146
- name: Add Docker apt repository to source list
4247
become: true
4348
ansible.builtin.apt_repository:
44-
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
49+
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
4550
filename: docker
4651
state: present
4752
update_cache: true

0 commit comments

Comments
 (0)