Commit Graph

2715 Commits (110ac2425631dd92357d8e4bbac3e1c7e769fa8c)

Author SHA1 Message Date
Sebastiaan van Stijn 110ac24256
vendor: github.com/docker/cli v20.10.0-beta1.0.20201029214301-1d20b15adc38
full diff: 2298e6a3fe...1d20b15adc

relevant changes:
- config: don't call homedir on init()
- config: fix error message using incorrect filename
- config: remove redundant os.Stat()
- config: Handle errors on close in config file write.
- config: ignore empty config file instead of printing warning
- config: Fix ConfigFile.Save() replacing symlink with file
- Config-file: remove User-Agent from config.json when saving

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-10-30 20:45:20 +01:00
Sebastiaan van Stijn 1934fd7370
vendor: github.com/docker/libnetwork v0.8.0-dev.2.0.20200917202933-d0951081b35f
full diff: d8334ccdb9...d0951081b3

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-10-30 20:45:18 +01:00
Sebastiaan van Stijn 72522d1740
vendor: golang.org/x/sys v0.0.0-20200922070232-aee5d888a860
full diff: 2334cc1a13...aee5d888a8

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-10-30 20:45:15 +01:00
Sebastiaan van Stijn c3f78d3e8a
vendor: github.com/gorilla/mux v1.8.0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-10-30 20:45:13 +01:00
Sebastiaan van Stijn 3d0c363f3f
vendor: github.com/Microsoft/go-winio v0.4.15-0.20200908182639-5b44b70ab3ab
full diff: fc70bd9a86...5b44b70ab3

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-10-30 20:45:08 +01:00
Tõnis Tiigi cc27ed5212
Merge pull request #1766 from thaJeztah/integrate_dockerignore
Migrate github.com/docker/docker/builder/dockerignore to BuildKit repository
2020-10-30 12:04:24 -07:00
Tõnis Tiigi 8efe89b347
Merge pull request #1767 from thaJeztah/bump_shlex
vendor: github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
2020-10-30 11:43:29 -07:00
Tõnis Tiigi 09299660eb
Merge pull request #1765 from ktock/sndoc
Add documentation about stargz/eStargz-based lazy pull functionality
2020-10-30 11:42:57 -07:00
Tõnis Tiigi 24f38cd342
Merge pull request #1764 from thaJeztah/replace_locker
replace github.com/docker/docker/pkg/locker with moby/locker v1.0.1
2020-10-30 11:41:59 -07:00
Akihiro Suda a4957ff806
Merge pull request #1762 from ktock/sgzconf
Delay decoding stargz config for avoiding extra dependency for config pkg
2020-10-30 21:03:50 +09:00
Sebastiaan van Stijn f9df470a4c
vendor: github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
full diff: 6f45313302...e7afc7fbc5

- Remove unnecessary UnreadRune call
- Add go.mod

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-10-30 12:11:11 +01:00
Sebastiaan van Stijn 40e6129775
frontend/dockerfile: use dockerignore package from buildkit
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-10-30 11:55:05 +01:00
Sebastiaan van Stijn 31edeb3eab
dockerignore: remove import path enforcement comments
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-10-30 11:52:59 +01:00
Sebastiaan van Stijn a9580f569a
Migrate github.com/docker/docker/builder/dockerignore to BuildKit repository
Strategy taken:

    # install filter-repo (https://github.com/newren/git-filter-repo/blob/main/INSTALL.md)
    brew install git-filter-repo

    cd ~/projects

    # create a temporary clone of docker
    git clone https://github.com/docker/docker.git docker_TEMP
    cd docker_TEMP

    # remove the origin remote (just for safety)
    git remote remove origin

    # create branch to work with
    git checkout -b migrate_dockerignore

    # remove all code, except for builder/dockerignore, and rewrite the files to frontend/dockerfile/dockerignore.
    git filter-repo --force --path builder/dockerignore --path-rename builder/dockerignore:frontend/dockerfile/dockerignore

    # check the results
    tree
    .
    └── frontend
        └── dockerfile
            └── dockerignore
                ├── dockerignore.go
                └── dockerignore_test.go

    3 directories, 2 files

    # go to the target github.com/moby/sys repository
    cd ~/projects/buildkit

    # create a branch to work with
    git checkout -b integrate_dockerignore

    # add the temporary repository as an upstream and make sure it's up-to-date
    git remote add docker_TEMP ~/projects/docker_TEMP
    git fetch docker_TEMP

    # merge the upstream code
    git merge --allow-unrelated-histories --signoff -S docker_TEMP/migrate_dockerignore

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-10-30 11:51:18 +01:00
ktock 5cbf8a152b Add documentation about stargz/eStargz support
Signed-off-by: ktock <ktokunaga.mail@gmail.com>
2020-10-30 19:25:41 +09:00
Sebastiaan van Stijn fbe1346912
replace github.com/docker/docker/pkg/locker with moby/locker v1.0.1
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-10-30 09:25:05 +01:00
ktock 0872ddf6aa Delay decoding stargz config for avoiding extra dependency for config pkg
`cmd/buildkitd/config` pkg is imported and used by other packages including
moby/moby.

Though stargz snapshotter configuration is currently effective only with
buildkitd + OCI worker, `cmd/buildkitd/config` consumer needs to introduce an
indirect dependency to stargz snapshotter's config pkg
(`github.com/containerd/stargz-snapshotter/stargz/config`), which is too much.

This commit solves this by delaying decoding the stargz config until OCI
worker's initialization phase.

Signed-off-by: ktock <ktokunaga.mail@gmail.com>
2020-10-29 23:44:43 +09:00
Akihiro Suda f4ebd6d352
Merge pull request #1760 from ktock/bump-ss
Bump stargz-snapshotter and partial registry logic integration
2020-10-29 21:46:39 +09:00
Tibor Vass 6b1c950745
Merge pull request #1559 from thaJeztah/fix_trailing_escape
Dockerfile: fix parsing of trailing backslash
2020-10-28 23:54:42 -07:00
ktock e3f6e0d249 Bump stargz-snapshotter and partial registry logic integration
Current stargz snapshotter pkg doesn't contain registry configuration and the
client of that pkg needs to pass it to that pkg. So this commit includes changes
of propagating buildkitd's registry configuration to stargz snapshotter.

But this is a partial integration of registry logic between buildkitd and stargz
snapshotter because buildkitd's session-based authentication logic is still not
applied to stargz snapshotter. This means private images that require
`~/.docker/config.json` creds can't be lazily pulled yet.

Signed-off-by: ktock <ktokunaga.mail@gmail.com>
2020-10-29 12:37:03 +09:00
Tõnis Tiigi a4f17f9995
Merge pull request #1757 from coryb/issue-1748
gateway exec: add platform and worker constraints to NewContainer api
2020-10-28 08:41:36 -07:00
Cory Bennett ffd4ab232e gateway exec: add platform and worker constraints to NewContainer api
Signed-off-by: Cory Bennett <cbennett@netflix.com>
2020-10-28 03:54:49 +00:00
Edgar Lee 5c201fa7b1
Merge pull request #1756 from hinshun/slow-exec-released
Add test for second solve using rootfs of first solve that error'ed from CalcSlowCache
2020-10-27 20:18:43 -07:00
Tonis Tiigi 6a3d6e983b source: fix puller error caching on cancellation
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2020-10-27 13:21:49 -07:00
Edgar Lee 7f0d13f9a5 Add test for second solve using rootfs of first solve that error'ed from CalcSlowCache
Signed-off-by: Edgar Lee <edgarl@netflix.com>
2020-10-27 12:12:38 -07:00
Akihiro Suda 2b4e3448e7
Merge pull request #1746 from tonistiigi/oci-mediatypes-cache
remotecache: allow oci mediatypes on exporting to registry
2020-10-27 11:42:02 +09:00
Tonis Tiigi dcbd31e1e0 readme: document oci-mediatypes cache export option
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2020-10-26 12:13:59 -07:00
Sebastiaan van Stijn cc7a3ded6f
Dockerfile: fix parsing of trailing backslash
If the line-continuation marker (`\`) is escaped, it should not be
treated as such, but as a literal backslash.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-10-26 12:29:05 +01:00
Sebastiaan van Stijn e367fd69c3
TestParseCases(): fix "expected" and "actual" being reversed
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-10-26 12:27:17 +01:00
Akihiro Suda 1b1d9e88dc
Merge pull request #1747 from tonistiigi/default-shell-path
dockerfile: set correct default path and shell based on OS
2020-10-26 16:37:12 +09:00
Akihiro Suda 3d4fa3e55f
Merge pull request #1752 from tonistiigi/discard-buildid
solver: make sure job id cleared after build
2020-10-26 16:17:38 +09:00
Akihiro Suda dec78e3316
Merge pull request #1751 from tonistiigi/debug-addons
debug: enable gc triggers
2020-10-26 16:01:34 +09:00
Akihiro Suda a41fb8c48b
Merge pull request #1750 from tonistiigi/add-debug
Dockerfile: don’t remove debug info on buildkitd/runc binaries
2020-10-26 16:00:33 +09:00
Tonis Tiigi cac0b68f9e solver: make sure job id cleared after build
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2020-10-25 21:50:40 -07:00
Tonis Tiigi 34343949b9 debug: enable gc triggers
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2020-10-25 21:49:41 -07:00
Tonis Tiigi 588a149ff7 Dockerfile: don’t remove debug info on buildkitd/runc binaries
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2020-10-25 21:48:59 -07:00
Tonis Tiigi cec6dae19d dockerfile: add test for default shell and path
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2020-10-24 11:12:15 -07:00
Tonis Tiigi 63856b6a36 dockerfile: set default shell based on OS
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2020-10-23 15:30:23 -07:00
Tonis Tiigi ecf070a027 exec: use platform specific default path
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2020-10-23 15:30:23 -07:00
Tonis Tiigi 8adf951bc7 remotecache: allow oci mediatypes on exporting to registry
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2020-10-23 00:20:59 -07:00
Akihiro Suda 212a0b1439
Merge pull request #1745 from tonistiigi/readonly-config
authprovider: allow readonly config dir
2020-10-22 18:23:30 +09:00
Tonis Tiigi b7510f7487 authprovider: allow readonly config dir
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2020-10-21 22:12:51 -07:00
Edgar Lee 27672636fb
Merge pull request #1743 from coryb/runc-started-chan
update go-runc mod, use runc Started chan
2020-10-21 14:26:18 -07:00
Tõnis Tiigi 20ac10808d
Merge pull request #1744 from hinshun/parallel-contenthash
Enable parallelization of NewContentHashFunc
2020-10-21 14:06:21 -07:00
Cory Bennett 43d59b4aa1 update go-runc mod, use runc Started chan
Signed-off-by: Cory Bennett <cbennett@netflix.com>
2020-10-21 19:12:56 +00:00
Edgar Lee cd42b669c9 Enable parallelization of NewContentHashFunc
Signed-off-by: Edgar Lee <edgarl@netflix.com>
2020-10-21 11:17:34 -07:00
Akihiro Suda dda009a58c
Merge pull request #1739 from tonistiigi/empty-layer
clear file mount stubs and fix empty layer cases
2020-10-21 00:42:45 +09:00
Akihiro Suda 48991bf6c4
Merge pull request #1741 from coryb/runc-exiterror
update go-runc  module, use runc.ExitError for container exec status
2020-10-20 17:14:34 +09:00
Cory Bennett b464f1e315 update go-runc to use runc.ExitError for container exec status
Signed-off-by: Cory Bennett <cbennett@netflix.com>
2020-10-20 06:44:29 +00:00
Akihiro Suda a340d4171d
Merge pull request #1730 from tonistiigi/gcr-400
exporter: avoid descriptor annotations on docker manifests
2020-10-20 13:49:19 +09:00