Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dockerfile should source environment for global defaults #6823

Open
achave11-ucsc opened this issue Jan 13, 2025 · 0 comments
Open

Dockerfile should source environment for global defaults #6823

achave11-ucsc opened this issue Jan 13, 2025 · 0 comments
Assignees
Labels
-- [priority] Low bug [type] A defect preventing use of the system as specified debt [type] A defect incurring continued engineering cost infra [subject] Project infrastructure like CI/CD, build and deployment scripts no demo [process] Not to be demonstrated at the end of the sprint orange [process] Done by the Azul team

Comments

@achave11-ucsc
Copy link
Member

Index: Dockerfile
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/Dockerfile b/Dockerfile
--- a/Dockerfile	(revision 0b645c411a921d33cc31bc8a9068f6600752e16c)
+++ b/Dockerfile	(date 1736799217418)
@@ -64,15 +64,16 @@
 #
 RUN mkdir /build
 WORKDIR /build
-ENV project_root=/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
Index: .dockerignore
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/.dockerignore b/.dockerignore
--- a/.dockerignore	(revision 0b645c411a921d33cc31bc8a9068f6600752e16c)
+++ b/.dockerignore	(date 1736799425884)
@@ -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
@achave11-ucsc achave11-ucsc added the orange [process] Done by the Azul team label Jan 13, 2025
@achave11-ucsc achave11-ucsc self-assigned this Jan 16, 2025
@achave11-ucsc achave11-ucsc added bug [type] A defect preventing use of the system as specified debt [type] A defect incurring continued engineering cost infra [subject] Project infrastructure like CI/CD, build and deployment scripts -- [priority] Low labels Jan 16, 2025
@hannes-ucsc hannes-ucsc added the no demo [process] Not to be demonstrated at the end of the sprint label Feb 6, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
-- [priority] Low bug [type] A defect preventing use of the system as specified debt [type] A defect incurring continued engineering cost infra [subject] Project infrastructure like CI/CD, build and deployment scripts no demo [process] Not to be demonstrated at the end of the sprint orange [process] Done by the Azul team
Projects
None yet
Development

No branches or pull requests

2 participants