fix CONDA_OVERRIDE_ARCHSPEC=x86_64 location (#67)

CoffeaTeam · Jan 28, 2025 · de5a7a9 · de5a7a9
1 parent 4b9d6ca
commit de5a7a9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/coffea-dask/Dockerfile.almalinux8 b/coffea-dask/Dockerfile.almalinux8
@@ -19,14 +19,14 @@ RUN yum -y install epel-release \
 
 COPY  environment.yaml environment-aarch64.yaml  /
 
-# Some ML packages packages dont work on aarch64 
+# Some ML packages packages dont work on aarch64
 RUN if [ "${TARGETPLATFORM}" == "linux/arm64" ]; then \
      export G_SLICE=always-malloc \
      && mamba install --yes python=${PYTHON_VERSION} \
      && mamba env update --file /environment-aarch64.yaml \
      && mamba clean -y --all ; \
-     else CONDA_OVERRIDE_ARCHSPEC=x86_64 mamba install --yes python=${PYTHON_VERSION} \
-     && mamba env update --file /environment.yaml \
+     else mamba install --yes python=${PYTHON_VERSION} \
+     && CONDA_OVERRIDE_ARCHSPEC=x86_64 mamba env update --file /environment.yaml \
      && mamba clean -y --all; fi
 
 # Make a symbolic link between installation /opt/conda/etc/grid-security and actual directory /etc/grid-security

diff --git a/coffea-dask/Dockerfile.almalinux9 b/coffea-dask/Dockerfile.almalinux9
@@ -19,14 +19,14 @@ RUN yum -y install epel-release \
 
      COPY  environment.yaml environment-aarch64.yaml  /
 
-# Some ML packages packages dont work on aarch64 
+# Some ML packages packages dont work on aarch64
 RUN if [ "${TARGETPLATFORM}" == "linux/arm64" ]; then \
      export G_SLICE=always-malloc \
      && mamba install --yes python=${PYTHON_VERSION} \
      && mamba env update --file /environment-aarch64.yaml \
      && mamba clean -y --all ; \
-     else CONDA_OVERRIDE_ARCHSPEC=x86_64 mamba install --yes python=${PYTHON_VERSION} \
-     && mamba env update --file /environment.yaml \
+     else mamba install --yes python=${PYTHON_VERSION} \
+     && CONDA_OVERRIDE_ARCHSPEC=x86_64 mamba env update --file /environment.yaml \
      && mamba clean -y --all; fi
 
 # Make a symbolic link between installation /opt/conda/etc/grid-security and actual directory /etc/grid-security