Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[18.09] Backport Buildkit fixes for 18.09 #59

Merged
merged 7 commits into from Sep 22, 2018

Conversation

Projects
None yet
4 participants
@tonistiigi
Copy link
Member

tonistiigi commented Sep 22, 2018

  • moby#37854 daemon/images: removed "found leaked image layer" warning, because it

  • moby#37852 add support for "registry-mirrors" and "insecure-registries" to buildkit

  • moby#37846 builder: use buildkit's GC for build cache

  • moby#37899 builder: vendor buildkit to 39404586a50d1b9d0fb1c578cf0f4de7bdb7afe5

  • partially adds moby#37843 with a boltdb repo switch. The duplicate is removed in a subsequent PR that updates containerd+swarmkit+libnetwork.

@andrewhsu @tiborvass @AntaresS

tiborvass and others added some commits Sep 5, 2018

builder: use buildkit's GC for build cache
This allows users to configure the buildkit GC.

The following enables the default GC:
```
{
  "builder": {
    "gc": {
      "enabled": true
    }
  }
}
```

The default GC policy has a simple config:
```
{
  "builder": {
    "gc": {
      "enabled": true,
      "defaultKeepStorage": "30GB"
    }
  }
}
```

A custom GC policy can be used instead by specifying a list of cache prune rules:
```
{
  "builder": {
    "gc": {
      "enabled": true,
      "policy": [
        {"keepStorage": "512MB", "filter": ["unused-for=1400h"]]},
        {"keepStorage": "30GB", "all": true}
      ]
    }
  }
}
```

Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit 4a776d0)
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
update vendor
Signed-off-by: Anda Xu <anda.xu@docker.com>
(cherry picked from commit 308701f)
(cherry picked from commit b48afc2)
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
add support of registry-mirrors and insecure-registries to buildkit
Signed-off-by: Anda Xu <anda.xu@docker.com>
(cherry picked from commit 171d51c)
(cherry picked from commit a72752b)
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
daemon/images: removed "found leaked image layer" warning, because it…
… is expected now with buildkit

Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit 5aa222d)
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
builder: vendor buildkit to 39404586a50d1b9d0fb1c578cf0f4de7bdb7afe5
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit d0f00bc)
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
vendor: update bolt to bbolt
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
vendor: add bbolt v1.3.1-etcd.8
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
@andrewhsu
Copy link

andrewhsu left a comment

LGTM

@andrewhsu andrewhsu added this to the 18.09.0 milestone Sep 22, 2018

@andrewhsu andrewhsu merged commit 0a6866b into docker:18.09 Sep 22, 2018

6 checks passed

experimental Jenkins build Docker-PRs-experimental 42263 has succeeded
Details
janky Jenkins build Docker-PRs 51046 has succeeded
Details
powerpc Jenkins build Docker-PRs-powerpc 11468 has succeeded
Details
vendor Jenkins build Docker-PRs-vendor 4679 has succeeded
Details
windowsRS1 Jenkins build Docker-PRs-WoW-RS1 22327 has succeeded
Details
z Jenkins build Docker-PRs-s390x 11336 has succeeded
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.