Skip to content

Commit

Permalink
fix(docker): Ensure the e2e tests pass in the dev container (#1942)
Browse files Browse the repository at this point in the history
* fix(devcontainer): install python3-venv.

This is required by the e2e test of pipx, which uses system packages.

* fix(docker:e2e): pass any GITHUB_API_TOKEN to the e2e test container.
  • Loading branch information
Adirelle committed Apr 23, 2024
1 parent 4150207 commit d13511e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion .mise.toml
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ run = 'docker build $root -f $root/packaging/dev/Dockerfile -t ghcr.io/jdx/mise:

[tasks."docker:cargo"]
description = "run cargo inside of development docker container"
run = 'docker run -ti --rm -v $root:/mise -w /mise ghcr.io/jdx/mise:dev cargo'
run = 'docker run -ti --rm -e "GITHUB_API_TOKEN=${GITHUB_API_TOKEN:-}" -v $root:/mise -w /mise ghcr.io/jdx/mise:dev cargo'

[tasks."docker:mise"]
description = "run mise inside of development docker container"
Expand Down
2 changes: 2 additions & 0 deletions packaging/dev/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ RUN apt-get update \
direnv \
fd-find \
fish \
python3-venv \
&& ln -s /usr/bin/{fdfind,fd} \
&& mkdir -p /etc/apt/keyrings \
&& curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
Expand All @@ -44,6 +45,7 @@ RUN apt-get update \
&& cargo -V \
&& node -v \
&& npm -v \
&& python3 -v \
&& just --version
# && mkdir -p $dev/cargo \
# && mv "$CARGO_HOME/registry" $dev/cargo/registry && ln -s $dev/cargo/registry "$CARGO_HOME/registry" \
Expand Down

0 comments on commit d13511e

Please sign in to comment.