diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index a8c93b5a49..95bd564666 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,8 +1,9 @@ # See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.245.2/containers/rust/.devcontainer/base.Dockerfile -# [Choice] Debian OS version (use bullseye on local arm64/Apple Silicon): buster, bullseye +# [Choice] Debian OS version (use 0-bullseye on local arm64/Apple Silicon): 0-buster, 0-bullseye bookworm +# Only bookworm works now dojoup ARG VARIANT -FROM mcr.microsoft.com/vscode/devcontainers/rust:0-${VARIANT} +FROM mcr.microsoft.com/vscode/devcontainers/rust:${VARIANT} # Install additional packages RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index fc597f73c6..63e50cc623 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -2,7 +2,7 @@ // https://github.com/microsoft/vscode-dev-containers/tree/v0.245.2/containers/rust { "name": "Rust", - "image": "ghcr.io/dojoengine/dojo-dev:4979471 ", + "image": "ghcr.io/matzayonc/dojo-dev:b838a3f7a840dd83b3ab5054b5bde2b6693d0c74", "runArgs": [ "--cap-add=SYS_PTRACE", "--security-opt", @@ -41,5 +41,5 @@ "remoteEnv": { "PATH": "${containerEnv:PATH}:/workspace/dojo/target/release:/home/vscode/.dojo/bin" }, - "postCreateCommand": "dojoup" + "postCreateCommand": "dojoup/dojoup && cargo install cargo-nextest" } \ No newline at end of file diff --git a/.github/workflows/devcontainer.yml b/.github/workflows/devcontainer.yml index d28914cc25..de0e0b8d90 100644 --- a/.github/workflows/devcontainer.yml +++ b/.github/workflows/devcontainer.yml @@ -40,7 +40,7 @@ jobs: file: .devcontainer/Dockerfile tags: ghcr.io/${{ github.repository }}-dev:latest,ghcr.io/${{ github.repository }}-dev:${{ env.DOCKER_TAG }} build-args: | - VARIANT=bullseye + VARIANT=bookworm platforms: linux/amd64,linux/arm64 cache-from: type=registry,ref=ghcr.io/${{ github.repository }}-dev:latest cache-to: type=registry,ref=ghcr.io/${{ github.repository }}-dev:cache diff --git a/crates/torii/graphql/src/tests/types-test/Scarb.lock b/crates/torii/graphql/src/tests/types-test/Scarb.lock index 048d2746c4..39a4178583 100644 --- a/crates/torii/graphql/src/tests/types-test/Scarb.lock +++ b/crates/torii/graphql/src/tests/types-test/Scarb.lock @@ -3,7 +3,7 @@ version = 1 [[package]] name = "dojo" -version = "0.3.13" +version = "0.3.14" dependencies = [ "dojo_plugin", ] diff --git a/examples/spawn-and-move/Scarb.lock b/examples/spawn-and-move/Scarb.lock index 24a4548ad3..195bf62bf5 100644 --- a/examples/spawn-and-move/Scarb.lock +++ b/examples/spawn-and-move/Scarb.lock @@ -3,14 +3,14 @@ version = 1 [[package]] name = "dojo" -version = "0.3.12" +version = "0.3.14" dependencies = [ "dojo_plugin", ] [[package]] name = "dojo_examples" -version = "0.3.12" +version = "0.3.14" dependencies = [ "dojo", ]