From 4acfac27ed6789d5d14b86f44db3f0d384723ef1 Mon Sep 17 00:00:00 2001
From: Joseph Hunkeler <jhunkeler@gmail.com>
Date: Sat, 3 Mar 2018 12:29:13 -0500
Subject: * Reorder system dependencies * Add sudo * jenkins users can now use
 sudo * Add 32-bit glibc

---
 Dockerfile | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index a8ab689..c6d3a78 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -30,53 +30,59 @@ ENV PYTHONUNBUFFERED=1 \
 
 # Toolchain
 RUN yum update -y && yum install -y \
-        openssh-server \
+        bzip2-devel \
         curl \
-        wget \
-        git \
-        subversion \
-        hg \
-        java-1.8.0-openjdk-devel \
         gcc \
         gcc-c++ \
         gcc-gfortran \
+        git \
+        glibc-devel.i686 \
         glibc-devel \
+        hg \
+        java-1.8.0-openjdk-devel \
         kernel-devel \
-        bzip2-devel \
-        zlib-devel \
-        ncurses-devel \
         libX11-devel \
         mesa-libGL \
         mesa-libGLU \
+        ncurses-devel \
+        openssh-server \
+        subversion \
+        sudo \
+        wget \
+        zlib-devel \
     && yum clean all
 
 # SSH Server configuration
 # Create 'jenkins' user
+# Configure sudoers
 RUN sed -i 's|#UseDNS.*|UseDNS no|' /etc/ssh/sshd_config \
     && ssh-keygen -f /etc/ssh/ssh_host_rsa_key -N '' -t rsa \
     && ssh-keygen -f /etc/ssh/ssh_host_dsa_key -N '' -t dsa \
     && groupadd jenkins \
     && useradd -g jenkins -m -d $HOME -s /bin/bash jenkins \
-    && echo "jenkins:jenkins" | chpasswd
+    && echo "jenkins:jenkins" | chpasswd \
+    && echo "jenkins ALL=(ALL)	NOPASSWD: ALL" >> /etc/sudoers
 
 # Install Miniconda
+# Reset permissions
 RUN curl -q -O ${MC_URL}/${MC_INSTALLER} \
     && bash ${MC_INSTALLER} -b -p ${MC_PATH} \
     && rm -rf ${MC_INSTALLER} \
-    && echo export PATH="${MC_PATH}/bin:\${PATH}" > /etc/profile.d/conda.sh
+    && echo export PATH="${MC_PATH}/bin:\${PATH}" > /etc/profile.d/conda.sh \
+    && chown -R jenkins: ${OPT} ${HOME}
 
 # Configure Conda
-# Reset permissions
 ENV PATH "${MC_PATH}/bin:${PATH}"
+USER jenkins
 RUN conda config --set auto_update_conda false \
     && conda install --yes --quiet \
         conda=${CONDA_VERSION} \
         conda-build=${CONDA_BUILD_VERSION} \
         git \
-        ${CONDA_PACKAGES} \
-    && chown -R jenkins: ${OPT} ${HOME}
+        ${CONDA_PACKAGES}
 
 # Inject custom handlers
+USER root
 ADD with_env /usr/local/bin
 
 WORKDIR ${HOME}
-- 
cgit