[R] Fix: Dockerfile should source environment for global defaults (#6823

)
DataBiosphere · Jan 23, 2025 · d46bcfb · d46bcfb
1 parent 3c617c5
commit d46bcfb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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