Merge pull request #58 from marcinslusarz/travis

Stop using sudo on Travis.

.travis.yml

@@ -1,5 +1,8 @@
 language: c
 
+services:
+  - docker
+
 env:
   matrix:
     - PUSH_IMAGE=1 MAKE_PKG=1 OS=ubuntu OS_VER=16.04
@@ -18,7 +21,6 @@ before_install:
   - export PROJECT=syscall_intercept
   - export EXTRA_DOCKER_ARGS=-t
   - cd utils/docker
-  - ./prepare-environment.sh
   - ./pull-or-rebuild-image.sh
   - if [[ -f push_image_to_repo_flag ]]; then PUSH_THE_IMAGE=1; fi
   - rm -f push_image_to_repo_flag

utils/docker/build.sh

@@ -47,7 +47,7 @@ if [[ -z "$HOST_WORKDIR" ]]; then
 	exit 1
 fi
 
-sudo chmod -R a+w $HOST_WORKDIR
+chmod -R a+w $HOST_WORKDIR
 
 if [[ "$TRAVIS_EVENT_TYPE" == "cron" || "$TRAVIS_BRANCH" == "coverity_scan" ]]; then
 	if [[ $COVERITY -eq 1 ]]; then
@@ -80,7 +80,7 @@ chmod a+w $HOST_WORKDIR
 #  - environment variables set (--env)
 #  - host directory containing the project source mounted (-v)
 #  - working directory set (-w)
-sudo docker run --rm --privileged=true --name=$containerName $EXTRA_DOCKER_ARGS -i \
+docker run --rm --privileged=true --name=$containerName $EXTRA_DOCKER_ARGS -i \
 	$ci_env \
 	--env http_proxy=$http_proxy \
 	--env https_proxy=$https_proxy \

utils/docker/images/build-image.sh

@@ -63,7 +63,7 @@ fi
 cp ../../../include/libsyscall_intercept_hook_point.h libsyscall_intercept_hook_point.h
 
 # Build a Docker image tagged with ${DOCKERHUB_REPO}:OS-VER
-sudo docker build -t $1:$2 \
+docker build -t $1:$2 \
 	--build-arg http_proxy=$http_proxy \
 	--build-arg https_proxy=$https_proxy \
 	-f Dockerfile.$2 .

utils/docker/images/push-image.sh

@@ -53,7 +53,7 @@ if [[ -z "$1" ]]; then
 fi
 
 # Check if the image tagged with ${DOCKERHUB_REPO}:OS-VER exists locally
-if [[ ! $(sudo docker images -a | awk -v pattern="^${DOCKERHUB_REPO}:$1\$" \
+if [[ ! $(docker images -a | awk -v pattern="^${DOCKERHUB_REPO}:$1\$" \
 	'$1":"$2 ~ pattern') ]]
 then
 	echo "ERROR: wrong argument."
@@ -62,7 +62,7 @@ then
 fi
 
 # Log in to the Docker Hub
-sudo docker login -u="${DOCKERHUB_USER}" -p="${DOCKERHUB_PASSWORD}"
+docker login -u="${DOCKERHUB_USER}" -p="${DOCKERHUB_PASSWORD}"
 
 # Push the image to the repository
-sudo docker push ${DOCKERHUB_REPO}:$1
+docker push ${DOCKERHUB_REPO}:$1

utils/docker/pull-or-rebuild-image.sh

@@ -129,4 +129,4 @@ done
 
 # Getting here means rebuilding the Docker image is not required.
 # Pull the image from Docker Hub.
-sudo docker pull ${DOCKERHUB_REPO}:$OS-$OS_VER
+docker pull ${DOCKERHUB_REPO}:$OS-$OS_VER