diff --git a/build-docker.sh b/build-docker.sh index 79b68d45e1..b89003b789 100755 --- a/build-docker.sh +++ b/build-docker.sh @@ -81,7 +81,7 @@ if [ "${CONTAINER_EXISTS}" != "" ]; then -e "GIT_HASH=${GIT_HASH}" \ --volumes-from="${CONTAINER_NAME}" --name "${CONTAINER_NAME}_cont" \ pi-gen \ - bash -e -o pipefail -c "dpkg-reconfigure qemu-user-static && + bash -e -o pipefail -c "dpkg-reconfigure qemu-user-static || true && cd /pi-gen; ./build.sh ${BUILD_OPTS} && rsync -av work/*/build.log deploy/" & wait "$!" @@ -91,7 +91,7 @@ else --volume "${CONFIG_FILE}":/config:ro \ -e "GIT_HASH=${GIT_HASH}" \ pi-gen \ - bash -e -o pipefail -c "dpkg-reconfigure qemu-user-static && + bash -e -o pipefail -c "dpkg-reconfigure qemu-user-static || true && cd /pi-gen; ./build.sh ${BUILD_OPTS} && rsync -av work/*/build.log deploy/" & wait "$!" diff --git a/stage0/00-configure-apt/files/learningequality-ubuntu-kolibri-bionic.list b/stage0/00-configure-apt/files/learningequality-ubuntu-kolibri-bionic.list index 50226fbf3f..0fbe7aa1ab 100644 --- a/stage0/00-configure-apt/files/learningequality-ubuntu-kolibri-bionic.list +++ b/stage0/00-configure-apt/files/learningequality-ubuntu-kolibri-bionic.list @@ -1,2 +1,2 @@ -deb http://ppa.launchpad.net/learningequality/kolibri-proposed/ubuntu bionic main +deb http://ppa.launchpad.net/learningequality/kolibri/ubuntu bionic main