mirror of
https://github.com/docker/docker-install.git
synced 2026-11-20 10:03:11 +03:00
Merge pull request #52 from seemethere/add_new_aarch64
Add new aarch64 distros
This commit is contained in:
2 files changed
+21
-4
No files matched your search
Vendored
+3
@@ -36,6 +36,9 @@ def s390xverifyTargets = [
|
||||
|
||||
def aarch64verifyTargets = [
|
||||
'aarch64-verify-install-ubuntu-xenial',
|
||||
'aarch64-verify-install-ubuntu-zesty',
|
||||
'aarch64-verify-install-debian-jessie',
|
||||
'aarch64-verify-install-debian-stretch',
|
||||
]
|
||||
|
||||
def ppc64leverifyTargets = [
|
||||
|
||||
+18
-4
@@ -51,6 +51,9 @@ ppc64le-ubuntu-xenial
|
||||
ppc64le-ubuntu-zesty
|
||||
ppc64le-ubuntu-artful
|
||||
aarch64-ubuntu-xenial
|
||||
aarch64-ubuntu-zesty
|
||||
aarch64-debian-jessie
|
||||
aarch64-debian-stretch
|
||||
armv6l-raspbian-jessie
|
||||
armv7l-raspbian-jessie
|
||||
armv6l-raspbian-stretch
|
||||
@@ -114,6 +117,14 @@ get_distribution() {
|
||||
echo "$lsb_dist"
|
||||
}
|
||||
|
||||
add_debian_backport_repo() {
|
||||
debian_version="$1"
|
||||
backports="deb http://ftp.debian.org/debian $debian_version-backports main"
|
||||
if ! grep -Fxq "$backports" /etc/apt/sources.list; then
|
||||
(set -x; $sh_c "echo \"$backports\" >> /etc/apt/sources.list")
|
||||
fi
|
||||
}
|
||||
|
||||
echo_docker_as_nonroot() {
|
||||
if is_dry_run; then
|
||||
return
|
||||
@@ -350,10 +361,13 @@ do_install() {
|
||||
case "$lsb_dist" in
|
||||
ubuntu|debian|raspbian)
|
||||
pre_reqs="apt-transport-https ca-certificates curl"
|
||||
if [ "$lsb_dist" = "debian" ] && [ "$dist_version" = "wheezy" ]; then
|
||||
backports="deb http://ftp.debian.org/debian wheezy-backports main"
|
||||
if ! grep -Fxq "$backports" /etc/apt/sources.list; then
|
||||
(set -x; $sh_c "echo \"$backports\" >> /etc/apt/sources.list")
|
||||
if [ "$lsb_dist" = "debian" ]; then
|
||||
if [ "$dist_version" = "wheezy" ]; then
|
||||
add_debian_backport_repo "$dist_version"
|
||||
fi
|
||||
# libseccomp2 does not exist for debian jessie main repos for aarch64
|
||||
if [ "$(uname -m)" = "aarch64" ] && [ "$dist_version" = "jessie" ]; then
|
||||
add_debian_backport_repo "$dist_version"
|
||||
fi
|
||||
fi
|
||||
if ! command -v gpg > /dev/null; then
|
||||
|
||||
Reference in new issue
Block a user