From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 63C5D138350 for ; Sun, 23 Feb 2020 19:46:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7E94AE0869; Sun, 23 Feb 2020 19:46:50 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 69768E0869 for ; Sun, 23 Feb 2020 19:46:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 19C2A34EF9D for ; Sun, 23 Feb 2020 19:46:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7D4D3CF for ; Sun, 23 Feb 2020 19:46:46 +0000 (UTC) From: "Alexys Jacob" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexys Jacob" Message-ID: <1582487166.dfea888bda7c3325472bb953a4fee7e8fdf04127.ultrabug@gentoo> Subject: [gentoo-commits] proj/docker-images:master commit in: / X-VCS-Repository: proj/docker-images X-VCS-Files: .travis.yml build.sh X-VCS-Directories: / X-VCS-Committer: ultrabug X-VCS-Committer-Name: Alexys Jacob X-VCS-Revision: dfea888bda7c3325472bb953a4fee7e8fdf04127 X-VCS-Branch: master Date: Sun, 23 Feb 2020 19:46:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0ae8a157-928c-46d6-af7e-880f8fc69560 X-Archives-Hash: 1aaaa4db35d42bd681880937e405a82e commit: dfea888bda7c3325472bb953a4fee7e8fdf04127 Author: Aaron Simmons gmail com> AuthorDate: Tue Feb 11 00:23:15 2020 +0000 Commit: Alexys Jacob gentoo org> CommitDate: Sun Feb 23 19:46:06 2020 +0000 URL: https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=dfea888b #75: support for building more gentoo arches Closes: https://github.com/gentoo/gentoo-docker-images/pull/76 Signed-off-by: Alexys Jacob gentoo.org> .travis.yml | 7 +++++++ build.sh | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/.travis.yml b/.travis.yml index 860b93e..b606fef 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,11 +13,18 @@ env: - TARGET=stage3-amd64-systemd - TARGET=stage3-x86 - TARGET=stage3-x86-hardened + - TARGET=stage3-armv7a + - TARGET=stage3-ppc + - TARGET=stage3-ppc64 + - TARGET=stage3-ppc64le before_install: # Install docker 17.05.0 or later - sudo apt-get update -qq - sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce + - echo '{"experimental":true}' | sudo tee /etc/docker/daemon.json + - sudo apt-get install qemu-user-static binfmt-support + - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes script: - VERSION="$(date -u +%Y%m%d)" - sudo ./build.sh diff --git a/build.sh b/build.sh index fcc8b12..eb38eac 100755 --- a/build.sh +++ b/build.sh @@ -23,6 +23,12 @@ ORG=${ORG:-gentoo} if [[ "${ARCH}" == "x86" ]]; then MICROARCH="i686" BOOTSTRAP="multiarch/alpine:x86-v3.7" +elif [[ "${ARCH}" = ppc* ]]; then + MICROARCH="${ARCH}" + ARCH=ppc +elif [[ "${ARCH}" = arm* ]]; then + MICROARCH="${ARCH}" + ARCH=arm else MICROARCH="${ARCH}" fi @@ -32,5 +38,6 @@ if [[ -n "${SUFFIX}" ]]; then SUFFIX="-${SUFFIX}" fi +set -x docker build --build-arg ARCH="${ARCH}" --build-arg MICROARCH="${MICROARCH}" --build-arg BOOTSTRAP="${BOOTSTRAP}" --build-arg SUFFIX="${SUFFIX}" -t "${ORG}/${TARGET}:${VERSION}" -f "${NAME}.Dockerfile" . docker tag "${ORG}/${TARGET}:${VERSION}" "${ORG}/${TARGET}:latest"