Commit Graph

153 Commits (98ce74b987e249ee6872f5f84396ca6cfb47a193)

Author SHA1 Message Date
Tonis Tiigi e0e29722e2 file: fix compilation on windows
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2020-01-30 20:21:40 -08:00
Paul "TBBle" Hampson 539b08cd5d Remove bashism from shared shell script
This file is consumed by both validate-vendor (inside an Alpine-based
Docker container where bash is not installed), and the other scripts.

Apart from validate-vendor, all the other scripts in hack/ use bash.

Fixes CI logging a complaint:
> ./hack/validate-vendor: 31: [: pull_request: unexpected operator

Signed-off-by: Paul "TBBle" Hampson <Paul.Hampson@Pobox.com>
2020-01-30 00:20:51 +11:00
l00397676 e6d003d27e Makefile: specify DOCKER_BUILDKIT when make images
When `make images` with buildmode docker-buildkit,
DOCKER_BUILDKIT=1 should be added to environments.

Signed-off-by: Lu Jingxiao <lujingxiao@huawei.com>
2020-01-26 18:13:11 +08:00
Edgar Lee bb0ed03111 Fix update generated files via docker buildkit
Signed-off-by: Edgar Lee <edgarl@netflix.com>
2019-11-01 10:37:00 -07:00
Akihiro Suda 5938170b84 hack: rename Dockerfiles
Fix https://github.com/moby/buildkit/issues/1208

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2019-10-18 17:21:48 +09:00
Tonis Tiigi c4f03056c9 hack: remove support for containerd 1.2
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2019-10-16 10:33:04 -07:00
Akihiro Suda e2ea141383 hack: remove legacy Dockerfile
Fix #1022

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2019-10-13 00:10:27 +09:00
Derek McGowan 46e7bc82d7 Update test dockerfiles for containerd
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2019-10-01 16:52:59 -07:00
Akihiro Suda 10cef0c6e1
Merge pull request #1177 from tonistiigi/unbound-var-fix
hack: fix unbound ci vars
2019-09-21 10:57:14 +09:00
Tonis Tiigi ce9dfec05f hack: update containerd daemon
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2019-09-20 14:59:54 -07:00
Tonis Tiigi 91198c3188 hack: fix unbound ci vars
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2019-09-20 14:53:28 -07:00
Tonis Tiigi d313ab6a58 hack: update to dockerfile-1.1
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2019-09-05 17:14:18 -07:00
Tonis Tiigi fdce39046a vendor: update containerd to v1.3.0-beta.2
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2019-08-21 20:22:55 -07:00
Tonis Tiigi a859c9df82 hack: enabled progressflag for ci_first_pass
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2019-08-20 17:26:48 -07:00
Tonis Tiigi b407790852 update containerd daemon to 1.2.7 and old to 1.1.7
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2019-08-20 17:02:43 -07:00
Tonis Tiigi 2cea1107d6 travis: add ci caching
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2019-08-17 09:13:06 -07:00
Tibor Vass 8347119800 hack: fix update-vendor script when using PREFER_BUILDCTL=1
Signed-off-by: Tibor Vass <tibor@docker.com>
2019-07-30 16:24:26 +00:00
Tonis Tiigi 69adb50902 hack: unbreak upgrade to buster
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2019-07-22 16:38:21 -07:00
Akihiro Suda d750cb188a
Merge pull request #1073 from tonistiigi/cni-net
add cni networking support
2019-07-19 10:47:27 +09:00
Tonis Tiigi 653c91e114 network: add non-lazy cni network init
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2019-07-12 11:00:02 -07:00
Tonis Tiigi e7759a861b client: add cni network tests
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2019-07-10 18:00:06 -07:00
Tonis Tiigi bc7a6f2556 add cni networking support
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2019-07-10 14:42:30 -07:00
Tibor Vass 969be2068e hack: fix runtime panic due to osuser build tag not set
Looks like due to a bug in Dockerfile frontend, only the BUILDKITD_TAGS
build arg was taken into account, not the env var.

Signed-off-by: Tibor Vass <tibor@docker.com>
2019-07-10 04:27:37 +00:00
Tibor Vass 477d7ef53d hack: build buildkitd for windows in buildkit-flavored Dockerfile
This is not meant to produce any working Windows binary of buildkitd.
Purpose is to catch compile failures on windows early.

Signed-off-by: Tibor Vass <tibor@docker.com>
2019-07-09 23:38:42 +00:00
Akihiro Suda bf220d3915 add buildctl-daemonless.sh
The script spawns ephemeral daemon for "daemonless" UX.

Usage:
  docker run -it --rm  \
  --security-opt seccomp=unconfined --security-opt apparmor=unconfined \
  -e BUILDKITD_FLAGS=--oci-worker-no-process-sandbox \
  -v /path/to/dir:/tmp/work \
  --entrypoint buildctl-daemonless.sh \
  moby/buildkit:master-rootless \
  build --frontend dockerfile.v0 --local context=/tmp/work --local dockerfile=/tmp/work

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2019-05-26 12:39:34 +09:00
Tonis Tiigi dad1297d91 update runc to v1.0.0-rc8
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2019-05-15 14:22:42 -07:00
Akihiro Suda 0c52d361fd bump up rootlesskit to v0.4.1
Now the child process is killed when the parent dies (rootless-containers/rootlesskit#66)

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2019-05-15 20:56:38 +09:00
Tonis Tiigi dcacc3985b hack: fix csv values
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2019-04-26 16:58:28 -07:00
Sebastiaan van Stijn ac7893837f
hack/binaries: add BUILDKITD_TAGS
This makes setting build-tags more convenient;

    make binaries BUILDKITD_TAGS="$(cat frontend/dockerfile/release/experimental/tags)"

Based-on-patch-by: Tonis Tiigi <tonistiigi@gmail.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-20 21:22:55 +02:00
Tõnis Tiigi 3cf36fe946
Merge pull request #895 from chendave/mailbox
test: avoid the error message when creating a user
2019-03-30 02:30:49 -07:00
Akihiro Suda 1795cfa25b test.Dockerfile: set BUILDKIT_HOST for rootless image
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2019-03-26 21:25:01 +09:00
Dave Chen ed0c226cde test: avoid the error message when creating a user
Run this command:
`docker build --tag davetest -f ./hack/dockerfiles/test.Dockerfile --target integration-tests`
Will throw this error message:
`Executing busybox-1.29.3-r10.trigger
OK: 184 MiB in 43 packages
Creating mailbox file: No such file or directory`

Not impact functionality but a little bit annoying.

Signed-off-by: Dave Chen <dave.chen@arm.com>
2019-03-22 21:03:18 -07:00
Dave Chen 28c9923fc1 Stop using the deprecated flag "--frontend-opt" for build
This patch replace "--frontend-opt" to "--opt" for the place
where it is appliable.

Signed-off-by: Dave Chen <dave.chen@arm.com>
2019-03-20 19:04:14 -07:00
Dave Chen c7ac2f392a Stop using the deprecated way for build
Signed-off-by: Dave Chen <dave.chen@arm.com>
2019-03-19 19:01:31 -07:00
Akihiro Suda cd89a8ce3d go 1.12
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2019-03-17 04:38:23 +09:00
Sebastiaan van Stijn a18c3d0dd5
Merge pull request #876 from tonistiigi/fix-latest-tagging
hack: fix tagging latest images on release
2019-03-15 02:10:28 +01:00
Tonis Tiigi a469f28267 hack: fix tagging latest images on release
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2019-03-14 16:18:48 -07:00
po3rin 31f565bc8c rm useless spaces
Signed-off-by: HiromuNakamura <abctail30@gmail.com>
2019-03-15 00:08:04 +09:00
Tonis Tiigi 216a54283b hack: fix buildkit detection of sh
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2019-03-10 23:48:12 -07:00
Akihiro Suda 340cb430aa Makefile: new target: images
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2019-03-02 15:42:10 +09:00
Akihiro Suda 05ccbce8f5 bump up runc (CVE-2019-5736)
0a8e4117e7
https://groups.google.com/a/opencontainers.org/forum/#!topic/dev/Tc1ELm-8oDI

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2019-02-11 23:41:25 +09:00
Tõnis Tiigi ac64f29f63
Merge pull request #800 from tiborvass/gomod
Migrate to go mod
2019-02-01 11:13:41 -08:00
Tibor Vass 175506ff7f hack: update scripts to be go mod compatible
Signed-off-by: Tibor Vass <tibor@docker.com>
2019-01-31 22:44:47 +00:00
Tonis Tiigi aed586f558 travis: include win/darwin binaries in cross
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2019-01-30 15:38:06 -08:00
Akihiro Suda b42582793a bump up runc
Including critical security fix for `runc run --no-pivot` (unlikely to
affect BuildKit): https://github.com/opencontainers/runc/pull/1962

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2019-01-15 16:23:21 +09:00
Patrick Van Stee f6c2487225
Isolate generated files for easier copying
Signed-off-by: Patrick Van Stee <patrick@vanstee.me>
2019-01-06 06:49:52 -05:00
Tõnis Tiigi c471ab81af
Merge pull request #761 from AkihiroSuda/containerd-121
update containerd to v1.2.1, runc to v1.0.0-rc6
2018-12-28 14:46:53 +02:00
Akihiro Suda 6ed72d683f update containerd to v1.2.1, runc to v1.0.0-rc6
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2018-12-26 19:48:01 +09:00
Tõnis Tiigi d1f5d3a65f
Merge pull request #456 from thaJeztah/add_maintainers
Add MAINTAINERS, AUTHORS files
2018-12-17 14:08:55 +00:00
Tonis Tiigi 3926820e3a update dockerfile repo location
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2018-12-03 11:06:17 +01:00