diff options
| author |   Juraj Linkeš <juraj.linkes@pantheon.tech> | 2020-11-23 10:24:17 +0100 |
|---|---|---|
| committer |   Dave Wallace <dwallacelf@gmail.com> | 2020-11-23 21:21:01 +0000 |
| commit | 137bdac5149ddc78245d6241438e659f6da9d24b (patch) | |
| tree | cb415c3d6b9bb91f93733f35a1ee25ebe1f52a09 | |
| parent | 4ba2294219a27d7c45b31cf182b14494df441151 (diff) | |
docker images: add aarch64 centos support
Add the changes that were missing for a successful build.
Change-Id: I0def3dcf2642110384674977ecf901c65fde4d78
Signed-off-by: Juraj Linkeš <juraj.linkes@pantheon.tech>
| -rw-r--r-- | docker/scripts/lib_common.sh | 2 | ||||
| -rw-r--r-- | docker/scripts/lib_dnf.sh | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/docker/scripts/lib_common.sh b/docker/scripts/lib_common.sh index 59d34c12..424aa785 100644 --- a/docker/scripts/lib_common.sh +++ b/docker/scripts/lib_common.sh @@ -179,7 +179,7 @@ export EXECUTOR_CLASS_ARCH="$EXECUTOR_DEFAULT_CLASS-$OS_ARCH" export EXECUTOR_CLASSES="$EXECUTOR_DEFAULT_CLASS csit csit_dut csit_shim" export EXECUTOR_ARCHS="aarch64 x86_64" declare -A EXECUTOR_CLASS_ARCH_OS_NAMES -EXECUTOR_CLASS_ARCH_OS_NAMES["builder-aarch64"]="ubuntu-18.04 ubuntu-20.04" +EXECUTOR_CLASS_ARCH_OS_NAMES["builder-aarch64"]="centos-7 centos-8 ubuntu-18.04 ubuntu-20.04" EXECUTOR_CLASS_ARCH_OS_NAMES["builder-x86_64"]="centos-7 centos-8 debian-9 debian-10 ubuntu-18.04 ubuntu-20.04" EXECUTOR_CLASS_ARCH_OS_NAMES["csit-aarch64"]="ubuntu-18.04" EXECUTOR_CLASS_ARCH_OS_NAMES["csit-x86_64"]="ubuntu-18.04" diff --git a/docker/scripts/lib_dnf.sh b/docker/scripts/lib_dnf.sh index 36107d68..41915e15 100644 --- a/docker/scripts/lib_dnf.sh +++ b/docker/scripts/lib_dnf.sh @@ -43,9 +43,9 @@ dnf_install_docker() { # Browse the base URL to see what is available & update accordingly. if [ "$OS_NAME" = "centos-8" ] ; then - dnf install -y https://download.docker.com/linux/$OS_ID/$OS_VERSION_ID/$OS_ARCH/stable/Packages/containerd.io-1.3.7-3.1.el8.x86_64.rpm - dnf install -y https://download.docker.com/linux/$OS_ID/$OS_VERSION_ID/$OS_ARCH/stable/Packages/docker-ce-cli-19.03.13-3.el8.x86_64.rpm - dnf install -y https://download.docker.com/linux/$OS_ID/$OS_VERSION_ID/$OS_ARCH/stable/Packages/docker-ce-19.03.13-3.el8.x86_64.rpm + dnf install -y https://download.docker.com/linux/$OS_ID/$OS_VERSION_ID/$OS_ARCH/stable/Packages/containerd.io-1.3.7-3.1.el8.$OS_ARCH.rpm + dnf install -y https://download.docker.com/linux/$OS_ID/$OS_VERSION_ID/$OS_ARCH/stable/Packages/docker-ce-cli-19.03.13-3.el8.$OS_ARCH.rpm + dnf install -y https://download.docker.com/linux/$OS_ID/$OS_VERSION_ID/$OS_ARCH/stable/Packages/docker-ce-19.03.13-3.el8.$OS_ARCH.rpm else echo_log "WARNING: Docker Image unknown for $OS_NAME!" fi |