Skip to content

Commit 021dea6

Browse files
authored
Merge pull request moby#5719 from tonistiigi/remove-azure
remove azure remote cache backend
2 parents 850c077 + c23fdca commit 021dea6

File tree

252 files changed

+1
-47302
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

252 files changed

+1
-47302
lines changed

Dockerfile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -396,9 +396,6 @@ RUN apk add --no-cache shadow shadow-uidmap sudo vim iptables ip6tables dnsmasq
396396
ARG NERDCTL_VERSION
397397
RUN curl -Ls https://raw.githubusercontent.com/containerd/nerdctl/$NERDCTL_VERSION/extras/rootless/containerd-rootless.sh > /usr/bin/containerd-rootless.sh \
398398
&& chmod 0755 /usr/bin/containerd-rootless.sh
399-
ARG AZURITE_VERSION
400-
RUN apk add --no-cache nodejs npm \
401-
&& npm install -g azurite@${AZURITE_VERSION}
402399
# The entrypoint script is needed for enabling nested cgroup v2 (https://github.com/moby/buildkit/issues/3265#issuecomment-1309631736)
403400
RUN curl -Ls https://raw.githubusercontent.com/moby/moby/v25.0.1/hack/dind > /docker-entrypoint.sh \
404401
&& chmod 0755 /docker-entrypoint.sh

README.md

Lines changed: 0 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ Join `#buildkit` channel on [Docker Community Slack](https://dockr.ly/comm-slack
6767
- [Local directory](#local-directory-1)
6868
- [GitHub Actions cache (experimental)](#github-actions-cache-experimental)
6969
- [S3 cache (experimental)](#s3-cache-experimental)
70-
- [Azure Blob Storage cache (experimental)](#azure-blob-storage-cache-experimental)
7170
- [Consistent hashing](#consistent-hashing)
7271
- [Metadata](#metadata)
7372
- [Systemd socket activation](#systemd-socket-activation)
@@ -590,55 +589,6 @@ Other options are:
590589
* `manifests_prefix=<prefix>`: set global prefix to store / read manifests on s3 (default: `manifests/`)
591590
* `name=<manifest>`: name of the manifest to use (default `buildkit`)
592591

593-
#### Azure Blob Storage cache (experimental)
594-
595-
```bash
596-
buildctl build ... \
597-
--output type=image,name=docker.io/username/image,push=true \
598-
--export-cache type=azblob,account_url=https://myaccount.blob.core.windows.net,name=my_image \
599-
--import-cache type=azblob,account_url=https://myaccount.blob.core.windows.net,name=my_image
600-
```
601-
602-
The following attributes are required:
603-
* `account_url`: The Azure Blob Storage account URL (default: `$BUILDKIT_AZURE_STORAGE_ACCOUNT_URL`)
604-
605-
Storage locations:
606-
* blobs: `<account_url>/<container>/<prefix><blobs_prefix>/<sha256>`, default: `<account_url>/<container>/blobs/<sha256>`
607-
* manifests: `<account_url>/<container>/<prefix><manifests_prefix>/<name>`, default: `<account_url>/<container>/manifests/<name>`
608-
609-
Azure Blob Storage configuration:
610-
* `container`: The Azure Blob Storage container name (default: `buildkit-cache` or `$BUILDKIT_AZURE_STORAGE_CONTAINER` if set)
611-
* `blobs_prefix`: Global prefix to store / read blobs on the Azure Blob Storage container (`<container>`) (default: `blobs/`)
612-
* `manifests_prefix`: Global prefix to store / read blobs on the Azure Blob Storage container (`<container>`) (default: `manifests/`)
613-
614-
Azure Blob Storage authentication:
615-
616-
There are 2 options supported for Azure Blob Storage authentication:
617-
618-
* Any system using environment variables supported by the [Azure SDK for Go](https://docs.microsoft.com/en-us/azure/developer/go/azure-sdk-authentication). The configuration must be available for the buildkit daemon, not for the client.
619-
* Secret Access Key, using the `secret_access_key` attribute to specify the primary or secondary account key for your Azure Blob Storage account. [Azure Blob Storage account keys](https://docs.microsoft.com/en-us/azure/storage/common/storage-account-keys-manage)
620-
621-
> [!NOTE]
622-
> Account name can also be specified with `account_name` attribute (or `$BUILDKIT_AZURE_STORAGE_ACCOUNT_NAME`)
623-
> if it is not part of the account URL host.
624-
625-
`--export-cache` options:
626-
* `type=azblob`
627-
* `mode=<min|max>`: specify cache layers to export (default: `min`)
628-
* `min`: only export layers for the resulting image
629-
* `max`: export all the layers of all intermediate steps
630-
* `prefix=<prefix>`: set global prefix to store / read files on the Azure Blob Storage container (`<container>`) (default: empty)
631-
* `name=<manifest>`: specify name of the manifest to use (default: `buildkit`)
632-
* Multiple manifest names can be specified at the same time, separated by `;`. The standard use case is to use the git sha1 as name, and the branch name as duplicate, and load both with 2 `import-cache` commands.
633-
* `ignore-error=<false|true>`: specify if error is ignored in case cache export fails (default: `false`)
634-
635-
`--import-cache` options:
636-
* `type=azblob`
637-
* `prefix=<prefix>`: set global prefix to store / read files on the Azure Blob Storage container (`<container>`) (default: empty)
638-
* `blobs_prefix=<prefix>`: set global prefix to store / read blobs on the Azure Blob Storage container (`<container>`) (default: `blobs/`)
639-
* `manifests_prefix=<prefix>`: set global prefix to store / read manifests on the Azure Blob Storage container (`<container>`) (default: `manifests/`)
640-
* `name=<manifest>`: name of the manifest to use (default: `buildkit`)
641-
642592
### Consistent hashing
643593

644594
If you have multiple BuildKit daemon instances, but you don't want to use registry for sharing cache across the cluster,

cache/remotecache/azblob/exporter.go

Lines changed: 0 additions & 217 deletions
This file was deleted.

0 commit comments

Comments
 (0)