From 10ea90e4161e25cee22121feac90ac26414115c7 Mon Sep 17 00:00:00 2001
From: Joseph Hunkeler <jhunkeler@gmail.com>
Date: Sat, 9 Sep 2017 22:00:12 -0400
Subject: Consolidate sections

---
 Dockerfile | 47 ++++++++++++++++++++++-------------------------
 1 file changed, 22 insertions(+), 25 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b7b8852..45ce891 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,32 +1,31 @@
 FROM centos:6.9
 
-# Generic Globals
-ENV OPT /opt
-ENV HOME /home/jenkins
+# Declare build-time environment
 
 # Miniconda
-ARG MC_VERSION
-ENV MC_VERSION 4.3.21
-ARG MC_PLATFORM
-ENV MC_PLATFORM Linux
-ARG MC_ARCH
-ENV MC_ARCH x86_64
-ARG MC_URL
-ENV MC_URL https://repo.continuum.io/miniconda
-ENV MC_INSTALLER Miniconda3-${MC_VERSION}-${MC_PLATFORM}-${MC_ARCH}.sh
-ENV MC_PATH ${OPT}/conda
+ARG MC_VERSION=4.3.21
+ARG MC_PLATFORM=Linux
+ARG MC_ARCH=x86_64
+ARG MC_URL=https://repo.continuum.io/miniconda
 
-# Conda Root
-ARG CONDA_VERSION
-ENV CONDA_VERSION 4.3.25
-ARG CONDA_BUILD_VERSION
-ENV CONDA_BUILD_VERSION  3.0.14
+# Conda root
+ARG CONDA_VERSION=4.3.25
+ARG CONDA_BUILD_VERSION=3.0.14
 ARG CONDA_PACKAGES
-ENV CONDA_PACKAGES ${CONDA_PACKAGES}
 
-# Jenkins Agent (?)
-ARG AGENT_VERSION=3.10
-ARG AGENT_WORKDIR=${OPT}/agent
+# Declare environment
+ENV OPT=/opt \
+    HOME=/home/jenkins
+
+ENV MC_VERSION=${MC_VERSION} \
+    MC_PLATFORM=${MC_PLATFORM} \
+    MC_ARCH=${MC_ARCH} \
+    MC_URL=${MC_URL} \
+    MC_INSTALLER=Miniconda3-${MC_VERSION}-${MC_PLATFORM}-${MC_ARCH}.sh \
+    MC_PATH=${OPT}/conda \
+    CONDA_VERSION=${CONDA_VERSION} \
+    CONDA_BUILD_VERSION=${CONDA_BUILD_VERSION} \
+    CONDA_PACKAGES=${CONDA_PACKAGES}
 
 # Toolchain
 RUN yum install -y \
@@ -72,9 +71,7 @@ RUN conda install --yes --quiet \
         conda=${CONDA_VERSION} \
         conda-build=${CONDA_BUILD_VERSION} \
         ${CONDA_PACKAGES} \
-    && mkdir -p ${HOME}/.jenkins \
-    && mkdir -p ${AGENT_WORKDIR} \
-    && chown -R jenkins: ${OPT} ${HOME} ${AGENT_WORKDIR}
+    && chown -R jenkins: ${OPT} ${HOME}
 
 WORKDIR ${HOME}
 
-- 
cgit 


From 29e22c6ede0bd5a08ec37ba7cf043d05b9d0b60e Mon Sep 17 00:00:00 2001
From: Joseph Hunkeler <jhunkeler@gmail.com>
Date: Sat, 9 Sep 2017 22:12:28 -0400
Subject: Remove unnecessary WORKDIR call

---
 Dockerfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 45ce891..9ee58b3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -58,7 +58,6 @@ RUN ssh-keygen -f /etc/ssh/ssh_host_rsa_key -N '' -t rsa \
     && echo "jenkins:jenkins" | chpasswd
 
 # Install Miniconda
-WORKDIR ${OPT}
 RUN curl -q -O ${MC_URL}/${MC_INSTALLER} \
     && bash ${MC_INSTALLER} -b -p ${MC_PATH} \
     && rm -rf ${MC_INSTALLER} \
-- 
cgit