From 81292f9cf333ce2ba6ce1dd1336e06ea99f208e3 Mon Sep 17 00:00:00 2001
From: tasekida <59004721+tasekida@users.noreply.github.com>
Date: Wed, 13 May 2020 23:06:26 +0900
Subject: [PATCH] =?UTF-8?q?Fix=20apt=20update=20don't=20access=20Docker?=
=?UTF-8?q?=E2=80=99s=20official=20repository=20for=20Ubuntu=20(#6106)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
roles/container-engine/docker/vars/ubuntu-amd64.yml | 4 ++--
roles/container-engine/docker/vars/ubuntu-arm64.yml | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/roles/container-engine/docker/vars/ubuntu-amd64.yml b/roles/container-engine/docker/vars/ubuntu-amd64.yml
index 66699b419..ce26c567e 100644
--- a/roles/container-engine/docker/vars/ubuntu-amd64.yml
+++ b/roles/container-engine/docker/vars/ubuntu-amd64.yml
@@ -32,7 +32,7 @@ docker_repo_info:
pkg_repo: apt_repository
repos:
- >
- deb {{ docker_ubuntu_repo_base_url }}
+ deb [arch={{ host_architecture }}] {{ docker_ubuntu_repo_base_url }}
{{ ansible_distribution_release|lower }}
stable
@@ -46,6 +46,6 @@ dockerproject_repo_info:
pkg_repo: apt_repository
repos:
- >
- deb {{ docker_ubuntu_repo_base_url }}
+ deb [arch={{ host_architecture }}] {{ docker_ubuntu_repo_base_url }}
{{ ansible_distribution|lower }}-{{ ansible_distribution_release|lower }}
main
diff --git a/roles/container-engine/docker/vars/ubuntu-arm64.yml b/roles/container-engine/docker/vars/ubuntu-arm64.yml
index 43ffd52c5..3021837e0 100644
--- a/roles/container-engine/docker/vars/ubuntu-arm64.yml
+++ b/roles/container-engine/docker/vars/ubuntu-arm64.yml
@@ -28,7 +28,7 @@ docker_repo_info:
pkg_repo: apt_repository
repos:
- >
- deb {{ docker_ubuntu_repo_base_url }}
+ deb [arch={{ host_architecture }}] {{ docker_ubuntu_repo_base_url }}
{{ ansible_distribution_release|lower }}
stable
@@ -42,6 +42,6 @@ dockerproject_repo_info:
pkg_repo: apt_repository
repos:
- >
- deb {{ docker_ubuntu_repo_base_url }}
+ deb [arch={{ host_architecture }}] {{ docker_ubuntu_repo_base_url }}
{{ ansible_distribution|lower }}-{{ ansible_distribution_release|lower }}
main
--
GitLab