fix tests

Author: scopatz

rever/docker.xsh

@@ -80,7 +80,7 @@ def conda_deps(conda=None, conda_channels=None):
     s += '    /opt/conda/bin/conda clean -tipsy && \\\n'
     s += '    ln -s /opt/conda/etc/profile.d/conda.sh /etc/profile.d/conda.sh && \\\n'
     s += '    echo ". /opt/conda/etc/profile.d/conda.sh" >> ~/.bashrc && \\\n'
-    s += '    echo "conda activate base" >> ~/.bashrc \\n'
+    s += '    echo "conda activate base" >> ~/.bashrc && \\\n'
     s += '    conda config --set always_yes yes && \\\n'
     if channels:
         for channel in channels[::-1]:

tests/test_docker.py

@@ -56,16 +56,37 @@ def test_apt_deps(dockerenv, deps, exp):
     ([], None, ''),
     ([], ['conda-forge'], ''),
     (['dep1', 'dep0'], [],
-"""RUN conda config --set always_yes yes && \\
+"""RUN wget --quiet https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh -O ~/miniconda.sh && \\
+    /bin/bash ~/miniconda.sh -b -p /opt/conda && \\
+    rm ~/miniconda.sh && \\
+    /opt/conda/bin/conda clean -tipsy && \\
+    ln -s /opt/conda/etc/profile.d/conda.sh /etc/profile.d/conda.sh && \\
+    echo ". /opt/conda/etc/profile.d/conda.sh" >> ~/.bashrc && \\
+    echo "conda activate base" >> ~/.bashrc && \\
+    conda config --set always_yes yes && \\
     conda update --all && \\
     conda install \\
         dep0 dep1 && \\
     conda clean --all && \\
     conda info
 
+ENV TINI_VERSION v0.16.1
+ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /usr/bin/tini
+RUN chmod +x /usr/bin/tini
+
+ENTRYPOINT [ "/usr/bin/tini", "--" ]
+CMD [ "/bin/bash" ]
+
 """),
     (['dep1', 'dep0'], ['conda-forge', 'my-channel'],
-"""RUN conda config --set always_yes yes && \\
+"""RUN wget --quiet https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh -O ~/miniconda.sh && \\
+    /bin/bash ~/miniconda.sh -b -p /opt/conda && \\
+    rm ~/miniconda.sh && \\
+    /opt/conda/bin/conda clean -tipsy && \\
+    ln -s /opt/conda/etc/profile.d/conda.sh /etc/profile.d/conda.sh && \\
+    echo ". /opt/conda/etc/profile.d/conda.sh" >> ~/.bashrc && \\
+    echo "conda activate base" >> ~/.bashrc && \\
+    conda config --set always_yes yes && \\
     conda config --add channels my-channel && \\
     conda config --add channels conda-forge && \\
     conda update --all && \\
@@ -74,6 +95,13 @@ def test_apt_deps(dockerenv, deps, exp):
     conda clean --all && \\
     conda info
 
+ENV TINI_VERSION v0.16.1
+ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /usr/bin/tini
+RUN chmod +x /usr/bin/tini
+
+ENTRYPOINT [ "/usr/bin/tini", "--" ]
+CMD [ "/bin/bash" ]
+
 """),
 ])
 def test_conda_deps(dockerenv, deps, channels, exp):
@@ -122,17 +150,27 @@ def test_git_configure(dockerenv, name, email, exp):
 EXP_BASE = """FROM zappa/project
 
 ENV HOME /root
+ENV LANG C.UTF-8
+ENV LC_ALL C.UTF-8
+ENV PATH /opt/conda/bin:$PATH
 ENV REVER_VCS git
 ENV VERSION x.y.z
 
 WORKDIR /root
 
 RUN apt-get -y update && \\
     apt-get install -y --fix-missing \\
-        dep0 dep1 && \\
+        bzip2 ca-certificates curl dep0 dep1 git wget && \\
     apt-get clean -y
 
-RUN conda config --set always_yes yes && \\
+RUN wget --quiet https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh -O ~/miniconda.sh && \\
+    /bin/bash ~/miniconda.sh -b -p /opt/conda && \\
+    rm ~/miniconda.sh && \\
+    /opt/conda/bin/conda clean -tipsy && \\
+    ln -s /opt/conda/etc/profile.d/conda.sh /etc/profile.d/conda.sh && \\
+    echo ". /opt/conda/etc/profile.d/conda.sh" >> ~/.bashrc && \\
+    echo "conda activate base" >> ~/.bashrc && \\
+    conda config --set always_yes yes && \\
     conda config --add channels my-channel && \\
     conda config --add channels conda-forge && \\
     conda update --all && \\
@@ -141,6 +179,13 @@ def test_git_configure(dockerenv, name, email, exp):
     conda clean --all && \\
     conda info
 
+ENV TINI_VERSION v0.16.1
+ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /usr/bin/tini
+RUN chmod +x /usr/bin/tini
+
+ENTRYPOINT [ "/usr/bin/tini", "--" ]
+CMD [ "/bin/bash" ]
+
 RUN pip install \\
     -r req1 -r req0 dep1 dep0
 """