Cleanup dev container

.devcontainer/devcontainer.json

@@ -1,10 +1,8 @@
 // For format details, see https://aka.ms/devcontainer.json. For config options, see the
 // README at: https://github.com/devcontainers/templates/tree/main/src/rust
 {
-	"name": "http",
-	"build": {
-		"dockerfile": "Dockerfile"
-	},
+	"name": "componentized-http",
+	"image": "mcr.microsoft.com/devcontainers/rust",
 	// Use 'mounts' to make the cargo cache persistent in a Docker Volume.
 	"mounts": [
 		{
@@ -23,7 +21,7 @@
 		"ghcr.io/devcontainers/features/github-cli:1": {}
 	},
 	// Use 'postCreateCommand' to run commands after the container is created.
-	"postCreateCommand": "cargo check",
+	"postCreateCommand": "./scripts/init-devcontainer.sh",
 	// Configure tool-specific properties.
 	"customizations": {
 		// Configure properties specific to VS Code.

.github/workflows/bump-version.yaml

@@ -26,7 +26,7 @@ jobs:
             - name: Install tools
               run: |
                   make tools
-                  echo "${PWD}/target/tools/bin" >> "${GITHUB_PATH}"
+                  make -s tools-path >> "${GITHUB_PATH}"
             - name: Bump version
               # also fetches the wit dependencies for the new version, and builds and tests the components
               run: scripts/bump-version.sh "${VERSION}"

.github/workflows/ci.yaml

@@ -21,7 +21,7 @@ jobs:
         # the versions pinned in tools/Cargo.toml, on the path for later steps
         run: |
           make tools
-          echo "${PWD}/target/tools/bin" >> "${GITHUB_PATH}"
+          make -s tools-path >> "${GITHUB_PATH}"
       - name: Sync wit
         run: make wit
       - name: Check for drift in generated wit
@@ -73,7 +73,7 @@ jobs:
       - name: Install tools
         run: |
           make tools
-          echo "${PWD}/target/tools/bin" >> "${GITHUB_PATH}"
+          make -s tools-path >> "${GITHUB_PATH}"
       - name: Install cosign
         uses: sigstore/cosign-installer@v4.1.2
       - name: Download components.tar

Makefile

@@ -4,15 +4,15 @@ export RUST_BACKTRACE ?= 1
 export WASMTIME_BACKTRACE_DETAILS ?= 1
 
 COMPONENTS_DIR := target/components
-TOOLS_DIR := target/tools
+TOOLS_DIR := target/tools/$(shell rustc --print host-tuple)
 # absolute, tools also run from other directories, e.g. `cd components && wkg fetch`
 export PATH := $(abspath $(TOOLS_DIR))/bin:$(PATH)
 
 # cargo binstall downloads prebuilt binaries, without it the tools are built with cargo install
 CARGO_INSTALL := $(if $(shell command -v cargo-binstall 2> /dev/null),cargo binstall --no-confirm --disable-telemetry,cargo install)
 
 COMPONENTS = $(sort $(foreach file,$(wildcard $(addprefix components/*/,wit/*.constants.wit *.properties *.wac *.wkg Cargo.toml)),$(word 2,$(subst /, ,$(file)))))
-TOOLS := componentized-constants-cli static-config wac-cli wasm-tools wkg
+TOOLS := componentized-constants-cli static-config wac-cli wasm-tools wasmtime-cli wkg
 
 export WKG_CONFIG_FILE := $(abspath .config/wasm-pkg/config.toml)
 
@@ -41,14 +41,18 @@ test: components
 
 
 tool_version = $(shell sed -n 's/^$(1) = "=\(.*\)"$$/\1/p' tools/Cargo.toml)
-# a stamp naming the version of a tool installed in target/tools/bin, e.g. `wkg@0.16.1`, the binary
+# a stamp naming the version of a tool installed in $(TOOLS_DIR)/bin, e.g. `wkg@0.16.1`, the binary
 # does not say which version it is. Bumping the pinned version names a stamp that does not exist yet,
 # so the tool is installed again.
 tool = $(TOOLS_DIR)/.installed/$(1)@$(call tool_version,$(1))
 
 .PHONY: tools ## Install the cli tools pinned in tools/Cargo.toml
 tools: $(foreach name,$(TOOLS),$(call tool,$(name)))
 
+.PHONY: tools-path ## Print the directory of the installed tools for this platform, to add to the PATH
+tools-path:
+	@echo $(abspath $(TOOLS_DIR))/bin
+
 define INSTALL_TOOL
 
 $(call tool,$1):

README.md

@@ -109,7 +109,7 @@ make components
 
 The build creates each component in [`components`](./components) into `target/components`, e.g. the client at `target/components/client/client.wasm`, along with `target/components/interface.wasm`, the `componentized:http` WIT package. Each component is also built with debug info, e.g. `target/components/client/client.debug.wasm`.
 
-The cli tools the build uses, [`static-config`](https://github.com/componentized/static-config), [`wasm-tools`](https://github.com/bytecodealliance/wasm-tools), [`wac`](https://github.com/bytecodealliance/wac) and [`wkg`](https://github.com/bytecodealliance/wasm-pkg-tools), are pinned in [`tools/Cargo.toml`](./tools/Cargo.toml) and installed into `target/tools` as needed, or ahead of time with `make tools`. Dependabot bumps the pinned versions.
+The cli tools the build uses, [`static-config`](https://github.com/componentized/static-config), [`wasm-tools`](https://github.com/bytecodealliance/wasm-tools), [`wac`](https://github.com/bytecodealliance/wac), [`wasmtime`](https://github.com/bytecodealliance/wasmtime) and [`wkg`](https://github.com/bytecodealliance/wasm-pkg-tools), are pinned in [`tools/Cargo.toml`](./tools/Cargo.toml) and installed into `target/tools/<platform>`, e.g. `target/tools/aarch64-apple-darwin`, as needed, or ahead of time with `make tools`. Dependabot bumps the pinned versions.
 
 ## Community
 

scripts/init-devcontainer.sh

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+# Setup script run once for new devcontainers to init the environment.
+
+set -euo pipefail
+
+curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash
+
+cargo check
+
+echo "export \"PATH=$(make -s tools-path):${PATH}\"" >> ~/.bashrc
+make tools

tools/Cargo.toml

@@ -17,6 +17,7 @@ componentized-constants-cli = "=0.1.0-dev"
 static-config = "=0.2.0"
 wac-cli = "=0.11.0"
 wasm-tools = "=1.259.0"
+wasmtime-cli = "=49.0.2"
 wkg = "=0.16.1"
 
 # not a member of the repository's workspace