Skip to content

Commit

Permalink
Merge commit '8d6a11bf939d7cc840fb333d4c73cb7945434fc7' (PR #22) into…
Browse files Browse the repository at this point in the history
… dmcc/wandb-tags/sc-14754
  • Loading branch information
dmcc committed Aug 9, 2024
2 parents ec2fd90 + 8d6a11b commit f19353d
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
12 changes: 6 additions & 6 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,18 @@ RUN apt update
RUN apt install --yes graphviz ${EXTRA_DEBIAN_PACKAGES}
# Store a list of all installed packages. Aeromancy will include this as
# metadata for each task.
RUN dpkg-query -f '${binary:Package}=${Version}\n' -W > /base/packages_list.txt
RUN dpkg-query -f '${binary:Package}=${Version}\n' -W > ./packages_list.txt

# Set up Python environment with pdm.
RUN pip3 install pdm

# pdm needs to see README.md and src/ (can be empty) to validate the project.
COPY --from=project pyproject.toml pdm.lock README.md /base/
RUN mkdir /base/src

# To access private repos on GitHub, we need to add it as a known host.
RUN mkdir -p -m 0700 ~/.ssh && ssh-keyscan github.com >> ~/.ssh/known_hosts

# pdm needs to see README.md and src/ (can be empty) to validate the project.
COPY --from=project pyproject.toml pdm.lock README.md ./
RUN mkdir ./src

# --mount=type=ssh allows us to use forwarded SSH authentication.
# --no-self since we haven't copied our project-specific code here yet (we do
# that last since it's the most variable step and should help keep image build
Expand All @@ -38,4 +38,4 @@ RUN --mount=type=ssh pdm install --prod --no-self
# Include Python code.
# Note that `project` must be mapped as a build context:
# https://docs.docker.com/engine/reference/commandline/buildx_build/#build-context
COPY --from=project ./src/ /base/src/
COPY --from=project ./src/ ./src/
2 changes: 1 addition & 1 deletion src/aeromancy/runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ def build_docker(
"--tag",
docker_tag,
# The version tag should be updated whenever Dockerfile changes.
"https://github.com/quant-aq/aeromancy.git#v0.1.0:docker",
"https://github.com/quant-aq/aeromancy.git#v0.2.2:docker",
),
)
docker_command = " ".join(docker_commmand_pieces)
Expand Down

0 comments on commit f19353d

Please sign in to comment.