aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Rendina <mrendina@stsci.edu>2020-06-09 20:44:42 -0400
committerMatt Rendina <mrendina@stsci.edu>2020-06-09 20:44:42 -0400
commit0f4aa966eef67556c04e0cc84db03eab0400ba35 (patch)
tree29607531e4cf8f0634cb262257f29d2e0cc757c1
parentccb0dabb308ba8855de5371ded0f8eea2bdf91ac (diff)
downloaddocker-buildsys-pipeline-0f4aa966eef67556c04e0cc84db03eab0400ba35.tar.gz
Adjust for new delivery method
Update conda version
-rw-r--r--Dockerfile17
1 files changed, 10 insertions, 7 deletions
diff --git a/Dockerfile b/Dockerfile
index 4871b87..786945e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,16 +3,21 @@ FROM centos:6.9
# Declare build-time environment
# Miniconda
-ARG MC_VERSION=4.5.4
+ARG MC_BASE_PYTHON=py37
+ARG MC_VERSION=4.8.2
ARG MC_PLATFORM=Linux
ARG MC_ARCH=x86_64
ARG MC_URL=https://repo.continuum.io/miniconda
# Conda root
-ARG CONDA_VERSION=4.5.10
+ARG CONDA_VERSION=4.8.2
ARG CONDA_BUILD_VERSION
ARG CONDA_PACKAGES
+# Pipeline definition
+ARG SNAPSHOT_URL
+
+
# Declare environment
ENV OPT=/opt \
HOME=/home/developer
@@ -22,7 +27,7 @@ ENV PYTHONUNBUFFERED=1 \
MC_PLATFORM=${MC_PLATFORM} \
MC_ARCH=${MC_ARCH} \
MC_URL=${MC_URL} \
- MC_INSTALLER=Miniconda3-${MC_VERSION}-${MC_PLATFORM}-${MC_ARCH}.sh \
+ MC_INSTALLER=Miniconda3-${MC_BASE_PYTHON}_${MC_VERSION}-${MC_PLATFORM}-${MC_ARCH}.sh \
MC_PATH=${OPT}/conda \
CONDA_VERSION=${CONDA_VERSION} \
CONDA_BUILD_VERSION=${CONDA_BUILD_VERSION} \
@@ -64,8 +69,6 @@ RUN curl -q -O ${MC_URL}/${MC_INSTALLER} \
&& echo export PATH="${MC_PATH}/bin:\${PATH}" > /etc/profile.d/conda.sh \
&& chown -R developer: ${OPT} ${HOME}
-# Pipeline definition
-ARG PIPELINE_URL
# Configure Conda
ENV PATH "${MC_PATH}/bin:${PATH}"
@@ -77,10 +80,10 @@ RUN conda config --set auto_update_conda false \
&& conda config --set rollback_enabled false \
&& conda install --yes --quiet \
conda=${CONDA_VERSION} \
- conda-build=${CONDA_BUILD_VERSION} \
git \
${CONDA_PACKAGES} \
- && conda install --file "${PIPELINE_URL}"
+ && curl -LO ${SNAPSHOT_URL} \
+ && conda env update -n base --file $(basename $SNAPSHOT_URL)
WORKDIR ${HOME}