Fixing Issues for the Ubuntu Builds in Docker

openvstorage · Jun 6, 2017 · 98d8d6e · 98d8d6e
1 parent 3ff68bb
commit 98d8d6e
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/docker/ubuntu1404/supervisord.conf b/docker/ubuntu1404/supervisord.conf
@@ -3,9 +3,15 @@ nodaemon=true
 
 [program:rpcbind]
 command=/sbin/rpcbind -f
+startsecs=5
+exitcodes=0
 
 [program:redis]
 command=bash -c "/usr/bin/redis-server /etc/redis/redis.conf"
+startsecs=5
+exitcodes=0
 
 [program:omniNames]
 command=bash -c "/usr/bin/omniNames -start -errlog /var/log/omniorb-nameserver.log  || /usr/bin/omniNames -errlog /var/log/omniorb-nameserver.log"
+startsecs=5
+exitcodes=0
diff --git a/docker/ubuntu1604/Dockerfile b/docker/ubuntu1604/Dockerfile
@@ -43,6 +43,9 @@ RUN groupadd -g 1002 jenkins && \
     useradd jenkins -s /bin/bash -g jenkins -m -u ${UID} -g 1002 -d /home/jenkins && \
     echo "jenkins ALL=NOPASSWD: ALL" >/etc/sudoers.d/jenkins
 
+#Creating TMP Directoy To Avoid permission Issues -- Bug in Xenial
+RUN mkdir /opt/tmp_docker; chmod -R 777 /opt/tmp_docker
+
 # volumedriver-core tests use arakoon & alba
 # (note: apt-get install -y --allow-unauthenticated arakoon alba does not yet work on 16.04)
 # volumedriver-core needs accelio library to build
@@ -52,7 +55,7 @@ RUN echo "deb http://apt.openvstorage.com unstable main" > /etc/apt/sources.list
     	    libxio0 libxio0-dbg libxio0-dbgsym \
     	    libxio-dev libxio-dev-dbgsym && \
     apt-get install -y libev4 && \
-    cd /tmp && apt-get download --allow-unauthenticated arakoon && \
+    cd /opt/tmp_docker && apt-get download --allow-unauthenticated arakoon && \
     dpkg -i --ignore-depends=libgflags2,libsnappy1 arakoon_*_amd64.deb && \
     #chown _apt arakoon_*_amd64.deb && \
     rm arakoon_*_amd64.deb && \
@@ -78,10 +81,12 @@ RUN sed -i "s/daemonize yes/daemonize no/g" /etc/redis/redis.conf
 # To preserve the logs for redis
 RUN chown -R redis:redis /var/log/redis/
 
+# Cleaning behind
+RUN rm -fr /opt/tmp_docker
+
 ADD supervisord.conf /etc/supervisor/supervisord.conf
 ADD docker-entrypoint.sh /sbin/docker-entrypoint.sh
 
-#ENTRYPOINT ["/sbin/docker-entrypoint.sh"]
+ENTRYPOINT ["/sbin/docker-entrypoint.sh"]
 
 CMD [ "/usr/bin/supervisord" ]
-CMD ["supervisord", "-n", "-c", "/etc/supervisor/supervisord.conf"]
diff --git a/docker/ubuntu1604/docker-entrypoint.sh b/docker/ubuntu1604/docker-entrypoint.sh
@@ -16,3 +16,6 @@ then
   chown ${UID} /home/jenkins
   [ -d /home/jenkins/.ssh ] && chown ${UID} /home/jenkins/.ssh
 fi
+
+# finally execute the command the user requested
+exec "$@"