Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion pkg/dockerfile/fast_generator.go
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ func (g *FastGenerator) installPython(lines []string, tmpDir string) ([]string,
if requirementsFile != "" {
lines = append(lines, "RUN "+strings.Join([]string{
"--mount=from=" + dockercontext.RequirementsBuildContextName + ",target=/buildtmp",
"--mount=from=" + dockercontext.SrcBuildContextName + ",target=/src",
"--mount=type=bind,src=\".\",target=/src",
UV_CACHE_MOUNT,
}, " ")+" cd /src && UV_CACHE_DIR=\""+UV_CACHE_DIR+"\" UV_LINK_MODE=copy UV_COMPILE_BYTECODE=0 /opt/r8/monobase/run.sh monobase.user --requirements=/buildtmp/requirements.txt")
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/dockerfile/fast_generator_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ func TestGeneratePythonPackages(t *testing.T) {
dockerfile, err := generator.GenerateDockerfileWithoutSeparateWeights()
require.NoError(t, err)
dockerfileLines := strings.Split(dockerfile, "\n")
require.Equal(t, "RUN --mount=from=requirements,target=/buildtmp --mount=from=src,target=/src --mount=type=cache,target=/srv/r8/monobase/uv/cache,id=uv-cache cd /src && UV_CACHE_DIR=\"/srv/r8/monobase/uv/cache\" UV_LINK_MODE=copy UV_COMPILE_BYTECODE=0 /opt/r8/monobase/run.sh monobase.user --requirements=/buildtmp/requirements.txt", dockerfileLines[5])
require.Equal(t, "RUN --mount=from=requirements,target=/buildtmp --mount=type=bind,src=\".\",target=/src --mount=type=cache,target=/srv/r8/monobase/uv/cache,id=uv-cache cd /src && UV_CACHE_DIR=\"/srv/r8/monobase/uv/cache\" UV_LINK_MODE=copy UV_COMPILE_BYTECODE=0 /opt/r8/monobase/run.sh monobase.user --requirements=/buildtmp/requirements.txt", dockerfileLines[5])
}

func TestGenerateVerboseEnv(t *testing.T) {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
build:
python_version: "3.12"
fast: true
python_requirements: "requirements.txt"
predict: "predict.py:Predictor"
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
from cog import BasePredictor


class Predictor(BasePredictor):
def predict(self, s: str) -> str:
return "hello " + s
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
my_package @ file://my_package-0.1-py2.py3-none-any.whl
12 changes: 12 additions & 0 deletions test-integration/test_integration/test_build.py
Original file line number Diff line number Diff line change
Expand Up @@ -498,3 +498,15 @@ def test_fast_build_with_local_image(docker_image):
os.remove(weights_file)

assert build_process.returncode == 0


def test_local_whl_install(docker_image):
project_dir = Path(__file__).parent / "fixtures/local-whl-install"

build_process = subprocess.run(
["cog", "build", "-t", docker_image],
cwd=project_dir,
capture_output=True,
)

assert build_process.returncode == 0
Loading