Fixing Issues for the Ubuntu Builds in Docker

Author: rainmanh

docker/arch/Dockerfile

@@ -17,7 +17,7 @@ RUN pacman -Sy --noconfirm gcc clang valgrind \
                            unzip doxygen git cmake \
                            wget openssl python2 libxml2 \
                            curl lsb-release \
-                           rabbitmq libaio krb5 c-ares libgcrypt \
+                           rabbitmq libaio krb5 c-ares \
                            python2-pylint libcap lz4 numactl libunwind google-glog \
                            \
                            # next are for volumedriver-core

docker/centos/Dockerfile

@@ -19,7 +19,7 @@ RUN echo '%_install_langs C' >> /etc/rpm/macros && \
                    cppzmq-devel tokyocabinet-devel bzip2-devel protobuf-compiler \
                    gflags-devel snappy-devel omniORB-devel omniORB-servers python-omniORB \
                    redis hiredis-devel lz4-devel \
-                   python-nose libcurl-devel libgcrypt-devel libgcrypt \
+                   python-nose libcurl-devel \
                    rpm rpm-build fuse protobuf-python fakeroot libxio-devel \
                    uriparser-devel supervisor rpcbind libunwind glog-devel && \
     yum clean all && \

docker/fc22/Dockerfile

@@ -16,7 +16,7 @@ RUN echo '%_install_langs C' >> /etc/rpm/macros && \
                    librdmacm-devel loki-lib-devel protobuf-devel lttng-ust-devel \
                    cppzmq-devel tokyocabinet-devel bzip2-devel protobuf-compiler \
                    gflags-devel snappy-devel omniORB-devel omniORB-servers python-omniORB \
-                   redis hiredis-devel libgcrypt-devel libgcrypt \
+                   redis hiredis-devel \
                    python-nose libcurl-devel lz4-devel \
                    rpm rpm-build fuse protobuf-python fakeroot debhelper \
                    supervisor rpcbind && \

docker/ubuntu/Dockerfile docker/ubuntu1404/Dockerfiledocker/ubuntu/Dockerfile renamed to docker/ubuntu1404/Dockerfile

@@ -25,7 +25,7 @@ RUN apt-get update && \
     apt-get update && \
     apt-get install -y gcc-4.9 g++-4.9 libstdc++-4.9-dev clang-3.5 \
                        libboost1.57-all-dev \
-                       build-essential libgcrypt11-dev libgcrypt11 \
+                       build-essential \
                        flex bison gawk check pkg-config \
                        autoconf libtool realpath bc gettext lcov \
                        unzip doxygen dkms debhelper pylint git cmake \
@@ -86,6 +86,12 @@ RUN usermod -a -G fuse jenkins && \
     usermod -a -G sudo jenkins && \
     usermod -a -G adm  jenkins
 
+# Redis cannot start as a daemon on a Docker build.
+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/
+
 ADD supervisord.conf /etc/supervisor/supervisord.conf
 ADD docker-entrypoint.sh /sbin/docker-entrypoint.sh
 

docker/ubuntu/docker-entrypoint.sh docker/ubuntu1404/docker-entrypoint.shdocker/ubuntu/docker-entrypoint.sh renamed to docker/ubuntu1404/docker-entrypoint.sh

@@ -12,7 +12,7 @@ RUN apt-get update -qq && \
     apt-get dist-upgrade -y && \
     apt-get install -y gcc g++ clang-3.8 valgrind \
                        libboost1.58-all-dev \
-                       build-essential sudo libgcrypt20-dev libgcrypt20 \
+                       build-essential sudo \
                        flex bison gawk check pkg-config \
                        autoconf libtool realpath bc gettext lcov \
                        unzip doxygen dkms debhelper pylint git cmake \
@@ -52,8 +52,9 @@ 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 /root && apt-get download --allow-unauthenticated arakoon && \
+    cd /tmp && apt-get download --allow-unauthenticated arakoon && \
     dpkg -i --ignore-depends=libgflags2,libsnappy1 arakoon_*_amd64.deb && \
+    #chown _apt arakoon_*_amd64.deb && \
     rm arakoon_*_amd64.deb && \
     apt-get clean
 
@@ -71,9 +72,16 @@ RUN update-alternatives --install /usr/bin/clang clang /usr/bin/clang-3.8 100 &&
     update-alternatives --install /usr/bin/scan-build scan-build /usr/bin/scan-build-3.8 100 && \
     update-alternatives --install /usr/bin/llvm-symbolizer llvm-symbolizer /usr/bin/llvm-symbolizer-3.8 100
 
+# Redis cannot start as a daemon on a Docker build.
+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/
+
 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"]

docker/ubuntu/supervisord.conf docker/ubuntu1404/supervisord.confdocker/ubuntu/supervisord.conf renamed to docker/ubuntu1404/supervisord.conf

@@ -16,11 +16,3 @@ then
   chown ${UID} /home/jenkins
   [ -d /home/jenkins/.ssh ] && chown ${UID} /home/jenkins/.ssh
 fi
-
-# update alba & arakoon packages to latest/greatest
-
-##apt-get update -qq
-##apt-get install -qq -y alba arakoon
-
-# finally execute the command the user requested
-exec "$@"

docker/ubuntu1604/Dockerfile

@@ -1,11 +1,17 @@
 [supervisord]
-nodaemon=true
+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