SSA-6324: trhing to resolve package conflicts

apps/cli/executables/datafetcher/test/Dockerfile

@@ -4,14 +4,14 @@
 # use docker_build.sh:
 # from apps/cli/executables/datafetcher,
 #
-#   ./docker_build,sh datafetcher_test[:N]
+#   ./docker_build.sh datafetcher_test[:N]
 #
 # where '-t' specifies a name and N' is the version.
 # (If ':N' is omitted, version is 'latest' by default.)
 # tag is not required for the build, but without it
 #the container name is an unhelpful hexadecimal value.
 
-FROM continuumio/miniconda3
+FROM continuumio/miniconda3:latest
 
 # get what we'll need for the build
 COPY . .
@@ -23,11 +23,12 @@ COPY test/ .
 # TODO: figure out a way to genericize this;
 # may need to have docker_build.sh write this Dockerfile
 # so it can update the PATH dynamically
-ENV PATH /Users/jgoldste/miniconda3/bin/conda:$PATH
+# ENV PATH /Users/jgoldste/miniconda3/bin/conda:$PATH
+ENV PATH $HOME/miniconda3/bin/conda:$PATH
 
-# docker_build.sh should have copied environment.yml from data/
-RUN echo $(ls -l ./environment.yml)
-RUN [ "conda", "env", "create", "-f", "environment.yml" ]
+# docker_build.sh should have copied environment.yml from data/;
+# it will be used in the command below
+RUN conda env update
 # environment.yml has name "data"
 RUN [ "conda", "activate", "data" ]
 

apps/cli/executables/datafetcher/test/docker-build.sh

@@ -45,7 +45,8 @@ cp ${SOURCE} ${NEW_FILE}
 # remove extended attributes, which would cause Capo to balk
 /usr/bin/xattr -c ${NEW_FILE}
 
-docker build . -f test/Dockerfile --no-cache -t ${CONTAINER_NAME}
+# don't use anything cached, including the FROM image
+docker build . -f test/Dockerfile --no-cache -t ${CONTAINER_NAME} --pull
 
 # now get rid of the properties file; containing sensitive info, it must NOT be saved or committed
 rm -f ${NEW_FILE}