[gentoo-commits] proj/docker-images:master commit in: /

["Alexys Jacob" <ultrabug@gentoo.org>]

commit:     4db589571a25fcaec79479dcb8d902b40dd3f995
Author:     Michael Everitt <michael <AT> 2e0cer <DOT> net>
AuthorDate: Tue Jul 28 08:30:17 2020 +0000
Commit:     Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Thu Aug 20 09:28:18 2020 +0000
URL:        https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=4db58957

Add support for musl stage3s on amd64/x86

Signed-off-by: Michael Everitt <gentoo <AT> veremit.xyz>
Closes: https://github.com/gentoo/gentoo-docker-images/pull/84
Signed-off-by: Alexys Jacob <ultrabug <AT> gentoo.org>

 .travis.yml | 3 +++
 build.sh    | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index b606fef..4d8417d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,9 +11,12 @@ env:
     - TARGET=stage3-amd64-hardened-nomultilib
     - TARGET=stage3-amd64-nomultilib
     - TARGET=stage3-amd64-systemd
+    - TARGET=stage3-amd64-musl-vanilla
+    - TARGET=stage3-amd64-musl-hardened
     - TARGET=stage3-x86
     - TARGET=stage3-x86-hardened
     - TARGET=stage3-armv7a
+    - TARGET=stage3-x86-musl-vanilla
     - TARGET=stage3-ppc
     - TARGET=stage3-ppc64
     - TARGET=stage3-ppc64le

diff --git a/build.sh b/build.sh
index feacd63..887b597 100755
--- a/build.sh
+++ b/build.sh
@@ -14,7 +14,10 @@ IFS=- read -r NAME ARCH SUFFIX <<< "${TARGET}"
 DOCKER_ARCH="${ARCH}"
 
 # Ensure upstream directories for stage3-amd64-hardened+nomultilib work
-SUFFIX=${SUFFIX/-/+}
+# unless we're building for musl targets (vanilla/hardened)
+if [[ "${SUFFIX}" != *musl* ]]; then
+	SUFFIX=${SUFFIX/-/+}
+fi
 
 VERSION=${VERSION:-$(date -u +%Y%m%d)}