Skip to content

COG_EXPERIMENTAL_BUILD_STAGE_DEPS for dependencies required in the pip install stage #1289

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Sep 5, 2023
Merged

COG_EXPERIMENTAL_BUILD_STAGE_DEPS for dependencies required in the pip install stage #1289

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d5046b8
REPLICATE_EXPERIMENTAL_BUILD_STAGE_DEPS
technillogue Sep 5, 2023
f06c91c
call it COG
technillogue Sep 5, 2023
f733cf8
fmt
technillogue Sep 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions pkg/dockerfile/generator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,9 +352,18 @@ func (g *Generator) pipInstallStage() (string, error) {
if err != nil {
return "", err
}
// Not slim, so that we can compile wheels
fromLine := `FROM python:` + g.Config.Build.PythonVersion + ` as deps`
// Sometimes, in order to run `pip install` successfully, some system packages need to be installed
// or some other change needs to happen
// this is a bodge to support that
// it will be reverted when we add custom dockerfiles
buildStageDeps := os.Getenv("COG_EXPERIMENTAL_BUILD_STAGE_DEPS")
if buildStageDeps != "" {
fromLine = fromLine + "\nRUN " + buildStageDeps
}
lines := []string{
// Not slim, so that we can compile wheels
`FROM python:` + g.Config.Build.PythonVersion + ` as deps`,
fromLine,
installCog,
copyLine[0],
"RUN --mount=type=cache,target=/root/.cache/pip pip install -t /dep -r " + containerPath,
Expand Down