Skip to content

Install Python before apt packages for better cacheability #13

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
andreasjansson merged 1 commit into from
Apr 2, 2021
Merged

Install Python before apt packages for better cacheability #13

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
6 changes: 3 additions & 3 deletions pkg/docker/generate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@ func (g *DockerfileGenerator) Generate() (string, error) {
return "", err
}
preamble := g.preamble()
aptInstalls, err := g.aptInstalls()
installPython, err := g.installPython()
if err != nil {
return "", err
}
installPython, err := g.installPython()
aptInstalls, err := g.aptInstalls()
if err != nil {
return "", err
}
Expand All @@ -57,8 +57,8 @@ func (g *DockerfileGenerator) Generate() (string, error) {
return strings.Join(filterEmpty([]string{
"FROM " + baseImage,
preamble,
aptInstalls,
installPython,
aptInstalls,
pythonRequirements,
pipInstalls,
g.installCog(),
Expand Down
8 changes: 4 additions & 4 deletions pkg/docker/generate_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,9 @@ model: infer.py:Model

expectedCPU := `FROM ubuntu:20.04
ENV DEBIAN_FRONTEND=noninteractive
RUN ### --> Installing system packages
` + installPython("3.8") + `RUN ### --> Installing system packages
RUN apt-get update -qq && apt-get install -qy ffmpeg cowsay && rm -rf /var/lib/apt/lists/*
` + installPython("3.8") + `RUN ### --> Installing Python requirements
RUN ### --> Installing Python requirements
COPY my-requirements.txt /tmp/requirements.txt
RUN pip install -r /tmp/requirements.txt && rm /tmp/requirements.txt
RUN ### --> Installing Python packages
Expand All @@ -117,9 +117,9 @@ CMD ["python", "-c", "from infer import Model; Model().start_server()"]`

expectedGPU := `FROM nvidia/cuda:11.0-devel-ubuntu20.04
ENV DEBIAN_FRONTEND=noninteractive
RUN ### --> Installing system packages
` + installPython("3.8") + `RUN ### --> Installing system packages
RUN apt-get update -qq && apt-get install -qy ffmpeg cowsay && rm -rf /var/lib/apt/lists/*
` + installPython("3.8") + `RUN ### --> Installing Python requirements
RUN ### --> Installing Python requirements
COPY my-requirements.txt /tmp/requirements.txt
RUN pip install -r /tmp/requirements.txt && rm /tmp/requirements.txt
RUN ### --> Installing Python packages
Expand Down