-
Notifications
You must be signed in to change notification settings - Fork 234
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into sync-noir
* master: (217 commits) feat: run benchmarks for ACIR proving (#6155) feat: generic key validation request (#6474) chore: fix migration notes (#6551) git subrepo push --branch=master noir-projects/aztec-nr git_subrepo.sh: Fix parent in .gitrepo file. [skip ci] chore: replace relative paths to noir-protocol-circuits git subrepo push --branch=master barretenberg feat: Adding autogenerated variants for the reset circuit (#6508) chore: Copy subset of constants to cpp (#6544) feat(docs): Key rotation / owner -> nullifier key docs (#6538) chore(docs): restructure improvs (#6502) chore: anvil kill wrapper now supports mac (#6520) feat: sum transaction fees and pay on l1 (#6522) refactor: private call validation (#6510) chore: add c++ tests for generator derivation (#6528) feat: View functions with static context enforcing (#6338) feat: Update the encrypted note log format (#6411) git subrepo push --branch=master noir-projects/aztec-nr git_subrepo.sh: Fix parent in .gitrepo file. [skip ci] chore: replace relative paths to noir-protocol-circuits ...
- Loading branch information
Showing
1,313 changed files
with
214,243 additions
and
24,536 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,22 +1,10 @@ | ||
| { | ||
| "name": "Development", | ||
| "build": { | ||
| "dockerfile": "../../build-images/Dockerfile", | ||
| "context": "../../build-images", | ||
| "target": "devbox" | ||
| "image": "aztecprotocol/devbox:1.0", | ||
| "features": { | ||
| // Use custom fork with noble added to list of supported distros. | ||
| "./docker-in-docker": {} | ||
| }, | ||
| "containerUser": "aztec-dev", | ||
| // ubuntu:noble is currently not supported. | ||
| // Can possibly workaround cherry-picking from here: | ||
| // https://github.com/devcontainers/features/blob/main/src/docker-in-docker/install.sh | ||
| // | ||
| // "image": "aztecprotocol/codespace", | ||
| // "features": { | ||
| // "docker-in-docker": { | ||
| // "version": "latest", | ||
| // "moby": true, | ||
| // "dockerDashComposeVersion": "v1" | ||
| // } | ||
| // }, | ||
| "mounts": ["source=devbox-home,target=/home/aztec-dev,type=volume"] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| ## Limitations | ||
|
|
||
| This docker-in-docker Dev Container Feature is roughly based on the [official docker-in-docker wrapper script](https://github.com/moby/moby/blob/master/hack/dind) that is part of the [Moby project](https://mobyproject.org/). With this in mind: | ||
| * As the name implies, the Feature is expected to work when the host is running Docker (or the OSS Moby container engine it is built on). It may be possible to get running in other container engines, but it has not been tested with them. | ||
| * The host and the container must be running on the same chip architecture. You will not be able to use it with an emulated x86 image with Docker Desktop on an Apple Silicon Mac, like in this example: | ||
| ``` | ||
| FROM --platform=linux/amd64 mcr.microsoft.com/devcontainers/typescript-node:16 | ||
| ``` | ||
| See [Issue #219](https://github.com/devcontainers/features/issues/219) for more details. | ||
|
|
||
|
|
||
| ## OS Support | ||
|
|
||
| This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed. | ||
|
|
||
| `bash` is required to execute the `install.sh` script. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| # Docker (Docker-in-Docker) (docker-in-docker) | ||
|
|
||
| **FORKED HERE TO SUPPORT NOBLE** | ||
|
|
||
| Create child containers _inside_ a container, independent from the host's docker instance. Installs Docker extension in the container along with needed CLIs. | ||
|
|
||
| ## Example Usage | ||
|
|
||
| ```json | ||
| "features": { | ||
| "ghcr.io/devcontainers/features/docker-in-docker:2": {} | ||
| } | ||
| ``` | ||
|
|
||
| ## Options | ||
|
|
||
| | Options Id | Description | Type | Default Value | | ||
| | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------- | ------------- | | ||
| | version | Select or enter a Docker/Moby Engine version. (Availability can vary by OS version.) | string | latest | | ||
| | moby | Install OSS Moby build instead of Docker CE | boolean | true | | ||
| | mobyBuildxVersion | Install a specific version of moby-buildx when using Moby | string | latest | | ||
| | dockerDashComposeVersion | Default version of Docker Compose (latest, v2 or none) | string | latest | | ||
| | azureDnsAutoDetection | Allow automatically setting the dockerd DNS server when the installation script detects it is running in Azure | boolean | true | | ||
| | dockerDefaultAddressPool | Define default address pools for Docker networks. e.g. base=192.168.0.0/16,size=24 | string | - | | ||
| | installDockerBuildx | Install Docker Buildx | boolean | true | | ||
| | installDockerComposeSwitch | Install Compose Switch (provided docker compose is available) which is a replacement to the Compose V1 docker-compose (python) executable. It translates the command line into Compose V2 docker compose then runs the latter. | boolean | true | | ||
|
|
||
| ## Customizations | ||
|
|
||
| ### VS Code Extensions | ||
|
|
||
| - `ms-azuretools.vscode-docker` | ||
|
|
||
| ## Limitations | ||
|
|
||
| This docker-in-docker Dev Container Feature is roughly based on the [official docker-in-docker wrapper script](https://github.com/moby/moby/blob/master/hack/dind) that is part of the [Moby project](https://mobyproject.org/). With this in mind: | ||
|
|
||
| - As the name implies, the Feature is expected to work when the host is running Docker (or the OSS Moby container engine it is built on). It may be possible to get running in other container engines, but it has not been tested with them. | ||
| - The host and the container must be running on the same chip architecture. You will not be able to use it with an emulated x86 image with Docker Desktop on an Apple Silicon Mac, like in this example: | ||
| ``` | ||
| FROM --platform=linux/amd64 mcr.microsoft.com/devcontainers/typescript-node:16 | ||
| ``` | ||
| See [Issue #219](https://github.com/devcontainers/features/issues/219) for more details. | ||
|
|
||
| ## OS Support | ||
|
|
||
| This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed. | ||
|
|
||
| `bash` is required to execute the `install.sh` script. | ||
|
|
||
| --- | ||
|
|
||
| _Note: This file was auto-generated from the [devcontainer-feature.json](https://github.com/devcontainers/features/blob/main/src/docker-in-docker/devcontainer-feature.json). Add additional notes to a `NOTES.md`._ |
70 changes: 70 additions & 0 deletions
70
.devcontainer/dev/docker-in-docker/devcontainer-feature.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| { | ||
| "id": "docker-in-docker", | ||
| "version": "2.10.2", | ||
| "name": "Docker (Docker-in-Docker)", | ||
| "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-in-docker", | ||
| "description": "Create child containers *inside* a container, independent from the host's docker instance. Installs Docker extension in the container along with needed CLIs.", | ||
| "options": { | ||
| "version": { | ||
| "type": "string", | ||
| "proposals": ["latest", "none", "20.10"], | ||
| "default": "latest", | ||
| "description": "Select or enter a Docker/Moby Engine version. (Availability can vary by OS version.)" | ||
| }, | ||
| "moby": { | ||
| "type": "boolean", | ||
| "default": true, | ||
| "description": "Install OSS Moby build instead of Docker CE" | ||
| }, | ||
| "mobyBuildxVersion": { | ||
| "type": "string", | ||
| "default": "latest", | ||
| "description": "Install a specific version of moby-buildx when using Moby" | ||
| }, | ||
| "dockerDashComposeVersion": { | ||
| "type": "string", | ||
| "enum": ["none", "latest", "v2"], | ||
| "default": "latest", | ||
| "description": "Default version of Docker Compose (latest, v2 or none)" | ||
| }, | ||
| "azureDnsAutoDetection": { | ||
| "type": "boolean", | ||
| "default": true, | ||
| "description": "Allow automatically setting the dockerd DNS server when the installation script detects it is running in Azure" | ||
| }, | ||
| "dockerDefaultAddressPool": { | ||
| "type": "string", | ||
| "default": "", | ||
| "proposals": [], | ||
| "description": "Define default address pools for Docker networks. e.g. base=192.168.0.0/16,size=24" | ||
| }, | ||
| "installDockerBuildx": { | ||
| "type": "boolean", | ||
| "default": true, | ||
| "description": "Install Docker Buildx" | ||
| }, | ||
| "installDockerComposeSwitch": { | ||
| "type": "boolean", | ||
| "default": true, | ||
| "description": "Install Compose Switch (provided docker compose is available) which is a replacement to the Compose V1 docker-compose (python) executable. It translates the command line into Compose V2 docker compose then runs the latter." | ||
| } | ||
| }, | ||
| "entrypoint": "/usr/local/share/docker-init.sh", | ||
| "privileged": true, | ||
| "containerEnv": { | ||
| "DOCKER_BUILDKIT": "1" | ||
| }, | ||
| "customizations": { | ||
| "vscode": { | ||
| "extensions": ["ms-azuretools.vscode-docker"] | ||
| } | ||
| }, | ||
| "mounts": [ | ||
| { | ||
| "source": "dind-var-lib-docker-${devcontainerId}", | ||
| "target": "/var/lib/docker", | ||
| "type": "volume" | ||
| } | ||
| ], | ||
| "installsAfter": ["ghcr.io/devcontainers/features/common-utils"] | ||
| } |
Oops, something went wrong.