From 5393018a0b57b9b0a22da706ed612f12f58b0a73 Mon Sep 17 00:00:00 2001
From: Abraham Chavez <achave11@ucsc.edu>
Date: Thu, 23 Jan 2025 13:54:43 -0800
Subject: [PATCH] [R] Fix: Dockerfile should source environment for global
 defaults (#6823)

---
 .dockerignore | 1 +
 Dockerfile    | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index 716a19c82e..a650f2f847 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -2,6 +2,7 @@
 !Makefile
 !common.mk
 !requirements*.txt
+!environment
 !bin/keys/docker-apt-keyring.pgp
 # FIXME: Remove fips_enabled
 #        https://github.com/DataBiosphere/azul/issues/6675
diff --git a/Dockerfile b/Dockerfile
index 4edfeda8e2..04feb54427 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -64,15 +64,15 @@ RUN --mount=type=bind,source=fips_enabled,target=${azul_proc_sys_crypto}/fips_en
 #
 RUN mkdir /build
 WORKDIR /build
-ENV project_root=/build
 
 # Install Azul dependencies
 #
 ARG PIP_DISABLE_PIP_VERSION_CHECK
 ENV PIP_DISABLE_PIP_VERSION_CHECK=${PIP_DISABLE_PIP_VERSION_CHECK}
-COPY requirements*.txt common.mk Makefile ./
+COPY environment requirements*.txt common.mk Makefile ./
 ARG make_target
-RUN make virtualenv \
+RUN source environment \
+    && make virtualenv \
     && source .venv/bin/activate \
     && make $make_target \
     && rm requirements*.txt common.mk Makefile