Skip to content

add --force flag to ln #1295

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 1 commit into from
Sep 11, 2023
Merged

add --force flag to ln #1295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/generator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@ func (g *Generator) pipInstalls() string {
return strings.Join(
[]string{
"COPY --from=deps --link /dep /dep",
"RUN ln -s /dep/* $(pyenv prefix)/lib/python*/site-packages",
"RUN ln --force -s /dep/* $(pyenv prefix)/lib/python*/site-packages",
},
"\n")
}
Expand Down
6 changes: 3 additions & 3 deletions pkg/dockerfile/generator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ ENV DEBIAN_FRONTEND=noninteractive
ENV PYTHONUNBUFFERED=1
ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/x86_64-linux-gnu:/usr/local/nvidia/lib64:/usr/local/nvidia/bin
` + testTini() + testInstallPython("3.8") + `COPY --from=deps --link /dep /dep
RUN ln -s /dep/* $(pyenv prefix)/lib/python*/site-packages
RUN ln --force -s /dep/* $(pyenv prefix)/lib/python*/site-packages
WORKDIR /src
EXPOSE 5000
CMD ["python", "-m", "cog.server.http"]
Expand Down Expand Up @@ -215,7 +215,7 @@ ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/x86_64-linux-gnu:/usr/local/nvidia
` + testTini() +
testInstallPython("3.8") + `RUN --mount=type=cache,target=/var/cache/apt apt-get update -qq && apt-get install -qqy ffmpeg cowsay && rm -rf /var/lib/apt/lists/*
COPY --from=deps --link /dep /dep
RUN ln -s /dep/* $(pyenv prefix)/lib/python*/site-packages
RUN ln --force -s /dep/* $(pyenv prefix)/lib/python*/site-packages
RUN cowsay moo
WORKDIR /src
EXPOSE 5000
Expand Down Expand Up @@ -367,7 +367,7 @@ ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/x86_64-linux-gnu:/usr/local/nvidia
` + testTini() +
testInstallPython("3.8") + `RUN --mount=type=cache,target=/var/cache/apt apt-get update -qq && apt-get install -qqy ffmpeg cowsay && rm -rf /var/lib/apt/lists/*
COPY --from=deps --link /dep /dep
RUN ln -s /dep/* $(pyenv prefix)/lib/python*/site-packages
RUN ln --force -s /dep/* $(pyenv prefix)/lib/python*/site-packages
RUN cowsay moo
COPY --from=weights --link /src/checkpoints /src/checkpoints
COPY --from=weights --link /src/models /src/models
Expand Down