Refactor all

1 files changed, 9 insertions, 44 deletions

diff --git a/Dockerfile b/Dockerfile
index 82214fd..d03e3e9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,71 +1,36 @@
-FROM centos:6.9
+FROM astroconda/base:1.0.0
 LABEL maintainer="jhunk@stsci.edu" \
       vendor="Space Telescope Science Institute"
 
-ENV TOOLCHAIN="/opt/toolchain"
-ENV TOOLCHAIN_BIN="${TOOLCHAIN}/bin"
-ENV TOOLCHAIN_LIB="${TOOLCHAIN}/lib"
-ENV TOOLCHAIN_INCLUDE="${TOOLCHAIN}/include"
-ENV TOOLCHAIN_DATA="${TOOLCHAIN}/share"
-ENV TOOLCHAIN_SYSCONF="${TOOLCHAIN}/etc"
-ENV TOOLCHAIN_MAN="${TOOLCHAIN_DATA}/man"
-ENV TOOLCHAIN_PKGCONFIG="${TOOLCHAIN_LIB}/pkgconfig"
-ENV TOOLCHAIN_BUILD="/opt/buildroot"
-ENV PATH="${TOOLCHAIN_BIN}:${PATH}"
-
 ARG PYTHON_VERSION=${PYTHON_VERSION:-3.7.1}
-ARG USER_ACCT=${USER_ACCT:-developer}
-ARG USER_HOME=/home/${USER_ACCT}
-ARG USER_UID=${USER_UID:-1000}
-ARG USER_GID=${USER_GID:-1000}
+
+USER root
 
 RUN yum install -y epel-release \
     && yum install -y \
-        gcc \
-        gcc-c++ \
-        gcc-gfortran \
-        git \
-        glibc \
-        libuuid-devel \
-        make \
-        perl \
-        pkgconfig \
-        expat-devel \
         bzip2-devel \
+        expat-devel \
         gdbm-devel \
+        git \
         libffi-devel \
+        libuuid-devel \
         ncurses-devel \
         openssl-devel \
         readline-devel \
         sqlite-devel \
-        sudo \
         tcl-devel \
         tk-devel \
-        wget \
-        which \
         xz-devel \
         zlib-devel \
-    && yum clean all \
-    && groupadd -g ${USER_GID} ${USER_ACCT} \
-    && useradd -u ${USER_UID} -g ${USER_ACCT} \
-       -m -d ${USER_HOME} -s /bin/bash ${USER_ACCT} \
-    && echo "${USER_ACCT}:${USER_ACCT}" | chpasswd \
-    && echo "${USER_ACCT} ALL=(ALL)	NOPASSWD: ALL" >> /etc/sudoers \
-    && echo export PATH="${TOOLCHAIN_BIN}:\${PATH}" > /etc/profile.d/toolchain.sh \
-    && echo export MANPATH="${TOOLCHAIN_MAN}:\${MANPATH}" >> /etc/profile.d/toolchain.sh \
-    && echo export PKG_CONFIG_PATH="${TOOLCHAIN_PKGCONFIG}:\${PKG_CONFIG_PATH}" >> /etc/profile.d/toolchain.sh
+    && yum clean all
 
 WORKDIR "${TOOLCHAIN_BUILD}"
+
 COPY scripts/ ${TOOLCHAIN_BUILD}/bin
 COPY etc/ ${TOOLCHAIN_BUILD}/etc
-
-RUN mkdir -p "${TOOLCHAIN}" \
-    && chown -R ${USER_ACCT}: \
-        ${TOOLCHAIN} \
-        ${TOOLCHAIN_BUILD}
+RUN chown -R ${USER_ACCT}: "${TOOLCHAIN_BUILD}"
 
 USER "${USER_ACCT}"
-
 RUN bin/build.sh \
     && sudo rm -rf "${TOOLCHAIN_BUILD}"