Merge pull request #514 from Demannu/dockerbeta-bugfix

AllTalkBeta: Docker Build: Fix conda build error logic

Dockerfile

@@ -41,7 +41,7 @@ COPY docker/conda/build/environment-*.yml environment.yml
 RUN <<EOR
     RESULT=$( { conda env create -f environment.yml ; } 2>&1 )
 
-    if echo $RESULT | grep -izq error ; then
+    if [ $? -ne 0 ] ; then
       echo "Failed to install conda dependencies: $RESULT"
       exit 1
     fi
@@ -129,9 +129,9 @@ COPY . .
 # Create script to execute firstrun.py and run it:
 ##############################################################################
 RUN echo $'#!/usr/bin/env bash \n\
-source ~/.bashrc \n\
+  source ~/.bashrc \n\
-conda activate alltalk \n\
+  conda activate alltalk \n\
-python ./system/config/firstrun.py $@' > ./start_firstrun.sh
+  python ./system/config/firstrun.py $@' > ./start_firstrun.sh
 
 RUN chmod +x start_firstrun.sh
 RUN ./start_firstrun.sh --tts_model $TTS_MODEL

docker/conda/Dockerfile

@@ -54,7 +54,7 @@ RUN <<EOR
       -c anaconda \
       -c nvidia ; } 2>&1 )
 
-    if echo $RESULT | grep -izq error ; then
+    if [ $? -ne 0 ] ; then
       echo "Failed to install conda dependencies: $RESULT"
       exit 1
     fi

docker/deepspeed/Dockerfile

@@ -40,7 +40,7 @@ COPY build/environment-*.yml environment.yml
 RUN <<EOR
     RESULT=$( { conda env create -f environment.yml ; } 2>&1 )
 
-    if echo $RESULT | grep -izq error ; then
+    if [ $? -ne 0 ] ; then
       echo "Failed to install conda dependencies: $RESULT"
       exit 1
     fi