Make build-docker bulletproof

learningequality · Dec 10, 2019 · 2e5fa9c · 2e5fa9c
1 parent 01e90eb
commit 2e5fa9c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
Original file line number	Diff line number	Diff line change
		@@ -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