diff --git a/pkg/dockerfile/generator.go b/pkg/dockerfile/generator.go index af3176d2b0..c34cfee4bb 100644 --- a/pkg/dockerfile/generator.go +++ b/pkg/dockerfile/generator.go @@ -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") } diff --git a/pkg/dockerfile/generator_test.go b/pkg/dockerfile/generator_test.go index 91e507cf17..668a3aea19 100644 --- a/pkg/dockerfile/generator_test.go +++ b/pkg/dockerfile/generator_test.go @@ -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"] @@ -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 @@ -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