successfully built rpm on fedora 25

build-in-docker.sh

@@ -2,15 +2,20 @@
 set -o errtrace
 
 # build and test everything in a fresh docker installation
-mode="apt"
+myarch=$(dpkg --print-architecture)
+if test "${arch}" = "amd64"; then
+    myarch="amd64|i386"
+fi
+mode="deb"
 img="ubuntu:latest"
 repos=()
 keys=()
-envs=()
-dirs=("-v $(pwd):/workdir")
+envs=("-e HOME=/home/$(id -un)" "-e TERM=xterm")
+dirs=("-v $(pwd):/workdir" "-v ${HOME}/.gnupg:/home/$(id -un)/.gnupg:ro")
 packages=()
 targets="all check distcheck"
 commands=()
+arch=$(dpkg --print-architecture)
 wait=0
 if test -e ./build-in-docker.conf; then
     # you can preconfigure the variables in file build-in-docker.conf
@@ -25,8 +30,9 @@ while test $# -gt 0; do
             echo "OPTIONS:"
             echo
             echo "  -h, --help            show this help"
-            echo "  -m, --mode <type>     mode: apt or yum, default: ${mode}"
+            echo "  -m, --mode <type>     mode: deb, rpm, default: ${mode}"
             echo "  -i, --image <image>   use given docker image instead of ${img}"
+            echo "  -a, --arch <arch>     build for given hardware architecture"
             echo "  -t, --targets targets specify build targets, default: ${targets}"
             echo "  -r, --repo <url>      add given apt repository"
             echo "  -k, --key <url>       add public key from url"
@@ -37,6 +43,8 @@ while test $# -gt 0; do
             echo "  -w, --wait            on error keep docker container and wait for enter"
             echo
             echo "  The option -i must be after -m, because mode sets a new default image"
+            echo "  The option -m must be after -t, because mode may be auto detected from targets"
+            echo "  If target is either deb or rpm, mode is set to the same value"
             echo
             echo "  The options -r -k -e -d -p -c can be repeated several times."
             echo
@@ -67,8 +75,10 @@ while test $# -gt 0; do
         (-m|--mode) shift;
             mode="$1"
             case "$mode" in
-                (apt) img="ubuntu:latest";;
+                (deb|apt) img="ubuntu:latest";;
+                (rpm|zypper) img="opensuse:latest";;
                 (yum) img="centos:latest";;
+                (dnf) img="fedora:latest";;
                 (*)
                     echo "**** ERROR: unknown mode '$1', try --help" 1>&2
                     exit 1
@@ -78,8 +88,16 @@ while test $# -gt 0; do
         (-i|--image) shift;
             img="$1"
             ;;
-        (-t|--targets) shift;
+        (-a|--arch) shift;
+            arch="$1"
+            ;;
+        (-t|--targets) shift
             targets="$1"
+            if test "$1" = "deb" -o "$1" = "rpm"; then
+                # set mode to same value
+                set -- "-m" $@
+                continue
+            fi
             ;;
         (-r|--repo) shift;
             repos+=("$1")
@@ -183,10 +201,20 @@ function ifthenelse() {
 set -x
 
 docker pull $img
-DOCKER_ID=$(docker run -d ${dirs[@]} ${envs[@]} -e HOME="${HOME}" -w /workdir $img sleep infinity)
+DOCKER_ID=$(docker create ${dirs[@]} ${envs[@]} -w /workdir $img sleep infinity)
 trap 'traperror '"${DOCKER_ID}"' "$? ${PIPESTATUS[@]}" $LINENO $BASH_LINENO "$BASH_COMMAND" "${FUNCNAME[@]}" "${FUNCTION}"' SIGINT INT TERM EXIT
+if ! [[ $arch =~ $myarch ]]; then
+    docker cp "/usr/bin/qemu-${arch}-static" "${DOCKER_ID}:/usr/bin/qemu-${arch}-static"
+fi
+docker start "${DOCKER_ID}"
+if docker exec ${DOCKER_ID} getent passwd > /dev/null 2>&1; then
+    docker exec ${DOCKER_ID} groupadd -g $(id -g) build
+    docker exec ${DOCKER_ID} useradd -g $(id -g) -u $(id -u) build
+else
+    docker exec ${DOCKER_ID} useradd -m -u $(id -u) -g $(id -u) -d"${HOME}" build
+fi
 case $mode in
-    (apt)
+    (deb|apt)
         OPTIONS='-o Dpkg::Options::=--force-confdef -o Dpkg::Options::=--force-confnew -y --force-yes --no-install-suggests --no-install-recommends'
         for f in 'libpam-systemd:amd64' 'policykit*' 'colord'; do
             docker exec ${DOCKER_ID} bash -c "echo 'Package: $f' >> /etc/apt/preferences"
@@ -214,23 +242,8 @@ case $mode in
         done
         docker exec ${DOCKER_ID} ./resolve-debbuilddeps.sh
         ;;
-    (yum)
+    (rpm|yum|dnf|zypper)
         ./bootstrap.sh -t dist
-        if [[ "$img" =~ "centos" ]]; then
-            docker exec ${DOCKER_ID} yum install -y redhat-lsb
-            docker exec -i ${DOCKER_ID} bash -c 'cat > /etc/yum.repos.d/wandisco-svn.repo' <<EOF
-[WandiscoSVN]
-name=Wandisco SVN Repo
-EOF
-            docker exec -i ${DOCKER_ID} bash -c 'echo "baseurl=http://opensource.wandisco.com/centos/$(lsb_release -sr | sed '"'"'s,[^0-9].*,,'"'"')/svn-'$(svn --version | head -1 | sed 's,[^0-9]*\([0-9]\+\.[0-9]\+\).*,\1,')'/RPMS/$(uname -i)/" >> /etc/yum.repos.d/wandisco-svn.repo'
-            docker exec -i ${DOCKER_ID} bash -c 'cat >> /etc/yum.repos.d/wandisco-svn.repo' <<EOF
-enabled=1
-gpgcheck=0
-EOF
-        fi
-        docker exec ${DOCKER_ID} yum install -y rpm-build 
-        docker exec ${DOCKER_ID} groupadd -g $(id -g) build
-        docker exec ${DOCKER_ID} useradd -g $(id -g) -u $(id -u) build
         docker exec ${DOCKER_ID} ./resolve-rpmbuilddeps.sh || true
         ;;
 esac