fix(docker): simplify stuff to workaround unneseccary problems with docker run

Author: actionless

.dockerignore

@@ -0,0 +1,3 @@
+.dockerignore
+Dockerfile
+maintenance_scripts/docker_test.sh

.gitignore

@@ -1,6 +1,5 @@
 __pycache__/
 .mypy_cache/
-Dockerfile
 locale/*.mo
 locale/pikaur.pot
 .idea/

.travis.yml

@@ -2,5 +2,4 @@ language: minimal
 services:
   - docker
 script:
-  - mv ./maintenance_scripts/Dockerfile ./
   - ./maintenance_scripts/docker_test.sh --coveralls

maintenance_scripts/Dockerfile Dockerfile

@@ -3,6 +3,12 @@
 FROM archlinux/base
 WORKDIR /opt/app-build/
 
+ARG TRAVIS
+ARG TRAVIS_JOB_ID
+ARG TRAVIS_BRANCH
+ARG TRAVIS_PULL_REQUEST
+ARG MODE=--local
+
 RUN pacman -Syu --noconfirm --needed sudo base-devel git && \
 	useradd -m user && \
 	echo "root ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers && \
@@ -22,6 +28,9 @@ RUN pacman -Sy ruby-ronn asp --noconfirm --needed && \
 	sudo -u user tar --transform 's,^,pikaur-git/,' -cf pikaur-git.tar.gz . && \
 	sudo -u user sed -i 's/"$pkgname::.*"/"pikaur-git.tar.gz"/' PKGBUILD && \
 	sudo -u user makepkg -fsi --noconfirm && \
+	sleep 0.1 && \
 	sudo -u user pikaur -S --noconfirm --color=always python-virtualenv \
 		python-pylint flake8 mypy python-vulture python-coveralls \
 		python2 python2-setuptools iputils # @TODO: coveralls workaround
+
+RUN sudo -u user ./maintenance_scripts/ci.sh $MODE --write-db

maintenance_scripts/docker_test.sh

@@ -10,33 +10,15 @@ set -x
 cd "$(readlink -e "$(dirname "${0}")")"/.. || exit 2
 
 
-rm -fr ./htmlcov/*
-mkdir -p ./htmlcov/
-
-
-sudo docker build ./ -t pikaur -f ./Dockerfile
-
 return_code=0
-sudo docker \
-	container run \
-	--dns="8.8.8.8" \
-	--tty \
-	--interactive \
-	--volume /run/dbus/system_bus_socket:/run/dbus/system_bus_socket:ro \
-	--volume "$(readlink -e ./htmlcov/)":/opt/app-build/htmlcov \
-	pikaur:latest \
-	sudo \
-		-u user \
-		env TRAVIS="${TRAVIS:-}" \
-			TRAVIS_JOB_ID="${TRAVIS_JOB_ID:-}" \
-			TRAVIS_BRANCH="${TRAVIS_BRANCH:-}" \
-			TRAVIS_PULL_REQUEST="${TRAVIS_PULL_REQUEST:-}" \
-		./maintenance_scripts/ci.sh "${1:--local}" --write-db \
+sudo docker build ./ \
+	--build-arg TRAVIS="${TRAVIS:-}" \
+	--build-arg TRAVIS_JOB_ID="${TRAVIS_JOB_ID:-}" \
+	--build-arg TRAVIS_BRANCH="${TRAVIS_BRANCH:-}" \
+	--build-arg TRAVIS_PULL_REQUEST="${TRAVIS_PULL_REQUEST:-}" \
+	--build-arg MODE="${1:---local}" \
+	-t pikaur -f ./Dockerfile \
 	|| return_code=$?
 
-if [[ "${1:-}" == "--local" ]] && [[ ${return_code} -eq 0 ]] ; then
-	firefox htmlcov/index.html
-fi
-
 echo "Exited with $return_code"
 exit ${return_code}