Commit Graph

6716 Commits

Author SHA1 Message Date
Justin Cormack
4968390a92
Merge pull request #3141 from masterzen/fix/3091-enforce-PAX-for-all-files
Fix #3091 enforce all outgoing tar files to use PAX
2018-07-29 11:35:48 -07:00
Brice Figureau
7a7f5f66c2 Fix #3091 enforce all outgoing tar files to use PAX
While processing the content of a tar image, linuxkit's moby tool is
blindly reusing the original tar format.

Moreover it locates the files under a new prefix, so if the original
file was stored as USTAR in the original archive, the filename length
and new prefix could be greater than the USTAR name limit leading
to a fatal error.

The fix is to always enforce PAX format on all copied files from the
original image archive.

Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
2018-07-29 11:03:44 +02:00
Rolf Neugebauer
deb627e56b
Merge pull request #3143 from rn/symlink-fix
cmd/pkg: Fix symlink handling in pkg build context
2018-07-27 20:23:52 +01:00
Rolf Neugebauer
23555494fe cmd/pkg: Fix symlink handling in pkg build context
When building the build context, symlink need special
treatment as the link name needs to be added when
building the tar.FileInfoHeader. This code does that.

We may also need to add a special case for hard links
as the moby/moby package 'archive' does, but this
should for now
fixes #3142

Signed-off-by: Rolf Neugebauer <rn@rneugeba.io>
2018-07-27 18:39:08 +01:00
Rolf Neugebauer
26ae9a0246
Merge pull request #3139 from rn/post_v0.6
Update version to v0.6+
2018-07-27 01:37:27 +01:00
Rolf Neugebauer
434ee1dffd Update version to v0.6+
Signed-off-by: Rolf Neugebauer <rn@rneugeba.io>
2018-07-27 00:06:06 +01:00
Rolf Neugebauer
10f07ca162
Merge pull request #3138 from rn/rel_v0.6
Release prep for v0.6
2018-07-27 00:03:32 +01:00
Rolf Neugebauer
483e7fd111 Update CHANGELOG
Signed-off-by: Rolf Neugebauer <rn@rneugeba.io>
2018-07-26 21:10:37 +01:00
Rolf Neugebauer
9edd8b232b Bump version to v0.6
Signed-off-by: Rolf Neugebauer <rn@rneugeba.io>
2018-07-26 21:02:29 +01:00
Rolf Neugebauer
8f841600a4 doc: Add updating AUTHORS to release steps
Signed-off-by: Rolf Neugebauer <rn@rneugeba.io>
2018-07-26 21:01:59 +01:00
Rolf Neugebauer
bb7961344d Update my email in AUTHORS and MAINTAINERS
Signed-off-by: Rolf Neugebauer <rn@rneugeba.io>
2018-07-26 21:00:24 +01:00
Rolf Neugebauer
d5d4d6fe0d Update package tags to v0.6
Signed-off-by: Rolf Neugebauer <rn@rneugeba.io>
2018-07-26 20:57:30 +01:00
Rolf Neugebauer
3084225180 example: Update docker DIND to 18.06.0
Signed-off-by: Rolf Neugebauer <rn@rneugeba.io>
2018-07-26 20:06:45 +01:00
Rolf Neugebauer
21ff90c4c7 pkgs: Update packages to the latest linuxkit/alpine
Signed-off-by: Rolf Neugebauer <rn@rneugeba.io>
2018-07-26 20:03:09 +01:00
Rolf Neugebauer
6fcd0e8429 tests: Update tests cases to the latest linuxkit/alpine
Signed-off-by: Rolf Neugebauer <rn@rneugeba.io>
2018-07-26 20:02:29 +01:00
Rolf Neugebauer
27bb10a14c Update use of test packages to latest
Signed-off-by: Rolf Neugebauer <rn@rneugeba.io>
2018-07-26 20:02:12 +01:00
Rolf Neugebauer
2b1428b3d6 tests: Update packages to the latest linuxkit/alpine
Signed-off-by: Rolf Neugebauer <rn@rneugeba.io>
2018-07-26 19:49:40 +01:00
Rolf Neugebauer
169e97fe52 Update use of tools to latest
Signed-off-by: Rolf Neugebauer <rn@rneugeba.io>
2018-07-26 19:49:18 +01:00
Rolf Neugebauer
768593b951 tools: Update to the latest linuxkit/alpine
Signed-off-by: Rolf Neugebauer <rn@rneugeba.io>
2018-07-26 19:22:42 +01:00
Rolf Neugebauer
ca53674154 tools/alpine: Update to latest
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@gmail.com>
2018-07-26 14:20:05 -04:00
Rolf Neugebauer
bfa8be505b
Merge pull request #3136 from rn/sources
Allow external directories for 'linuxkit pkg build'
2018-07-26 18:06:15 +01:00
Rolf Neugebauer
29dd9f2004 doc: Add 'sources' documentation
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2018-07-26 16:23:35 +01:00
Rolf Neugebauer
bebde3a2ea cmd/pkg: Build a build context from 'sources'
This is the final piece. If 'sources' are defined, tar up
the sources and rewrite them accordingly. Pass it as build
build context to 'docker'.

This allows building from something like this:

  ├── etc
  │   ├── foo
  └── foo
      ├── Dockerfile
          ├── build.yml
          └── main.go

With 'build.yml':

  image: foo
  extra-sources:
    - ../etc:etc

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2018-07-26 16:23:35 +01:00
Rolf Neugebauer
b03288f5b4 cmd/pkg: Add the ability to pass a build context to docker
This commit adds the ability to add a build context to
docker for the package build. The build context is passed
on stdin to the docker process.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2018-07-26 16:23:34 +01:00
Rolf Neugebauer
ba4d1c79b0 cmd/pkg: Extract 'extra-sources' and adjust hash calculation
If the build.yml specifies 'extra-sources', ie sources
outside the package directory, calculate the hash based on
the tree hash of all source directories and the package
directory.

Note, this requires the source directories to be under
git revision control.

Also clean up the src and dst of the path and stash the
result in the Pkg structure.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2018-07-26 16:23:34 +01:00
Rolf Neugebauer
75149c56c2 cmd/pkg: Add 'extra-source' field to the pkg schema
And 'sources' to the Pkg structure

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2018-07-26 14:27:54 +01:00
Rolf Neugebauer
ce6b15c0b6
Merge pull request #3137 from rn/kup
Kernel update to 4.17.10/4.14.58/4.9.115/4.4.144
2018-07-26 07:51:36 +01:00
Rolf Neugebauer
0c631d104f Update YAMLs to latest kernels.
Looks like I missed a few 4.4.x updates to the YAMLs.

Signed-off-by: Rolf Neugebauer <rn@rneugeba.io>
2018-07-25 23:02:39 +01:00
Rolf Neugebauer
21fb4db99b kernel: Update to 4.17.10/4.14.58/4.9.115/4.4.144
Signed-off-by: Rolf Neugebauer <rn@rneugeba.io>
2018-07-25 21:09:25 +01:00
Rolf Neugebauer
d2b8f5291d
Merge pull request #3135 from rn/kernel-iso
Add kernel+iso output
2018-07-25 13:14:19 +01:00
Rolf Neugebauer
cad4248024 tests: Fix summary for build format tests
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2018-07-25 11:41:36 +01:00
Rolf Neugebauer
b0212e7023 tests: Test kernel+iso format
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2018-07-25 11:41:32 +01:00
Rolf Neugebauer
69d913c5a7 cmd: Add 'kernel+iso' output format
This output format create a kernel + and straight data ISO.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2018-07-25 11:34:36 +01:00
Rolf Neugebauer
594ce1251d tools: Add a mkimage variant to build a non-bootable ISO.
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2018-07-25 11:25:59 +01:00
Rolf Neugebauer
1f9b598b1c
Merge pull request #3134 from rn/tools-fix
Fix mkimage- builds
2018-07-24 23:57:17 +01:00
Rolf Neugebauer
66b7417819 cmd: Update mkimage-* hashes
Signed-off-by: Rolf Neugebauer <rn@rneugeba.io>
2018-07-24 22:30:53 +01:00
Rolf Neugebauer
a9552aee2d tools: Fix mkimage-squashfs
Us a scratch image as the base instead of the alpine
base image.

Signed-off-by: Rolf Neugebauer <rn@rneugeba.io>
2018-07-24 22:30:53 +01:00
Rolf Neugebauer
fe569b627a tools: Fix mkimage-raw-efi
Use a scratch image as the base instead of the full
alpine base.

Signed-off-by: Rolf Neugebauer <rn@rneugeba.io>
2018-07-24 22:30:53 +01:00
Rolf Neugebauer
24d8ecc943 tools: Fix mkimage-raw-bios
Build the final image from scratch instead of the full
alpine base image.

Signed-off-by: Rolf Neugebauer <rn@rneugeba.io>
2018-07-24 22:30:53 +01:00
Rolf Neugebauer
99e65ef998 tools: Fix mkimage-qcow2-efi
Build the final image from scratch instead of the full
alpine base.

Signed-off-by: Rolf Neugebauer <rn@rneugeba.io>
2018-07-24 22:30:53 +01:00
Rolf Neugebauer
47bff24b94 tools: Fix mkimage-iso-efi
Build the final image from SCRATCH instead of the alpine base.
Should be a lot smaller now.

Signed-off-by: Rolf Neugebauer <rn@rneugeba.io>
2018-07-24 22:30:53 +01:00
Rolf Neugebauer
4ca0458526 tools: Use a multi-stage build for mkimage-iso-bios
mkimage-iso-bios contained the full alpine base. Only
copy packages actually needed.

Signed-off-by: Rolf Neugebauer <rn@rneugeba.io>
2018-07-24 22:30:53 +01:00
Rolf Neugebauer
d04a42868f
Merge pull request #3132 from rn/kernel-up
Update kernels to 4.17.8/4.17.9/4.14.57/4.9.114/4.4.142/4.4.143
2018-07-24 19:15:23 +01:00
Rolf Neugebauer
c2a083118e Update YAMLs to latest kernels
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2018-07-24 16:25:52 +01:00
Rolf Neugebauer
6bfba4e85c kernel: Adjust arm64 kernel config to upstream changes
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2018-07-24 13:13:42 +01:00
Rolf Neugebauer
480a8bc860 kernel: Update to 4.17.9/4.14.57/4.9.114/4.4.143
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2018-07-24 11:56:25 +01:00
Rolf Neugebauer
5ab7eaac89 kernel: Update to 4.17.8/4.4.142
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2018-07-24 10:26:37 +01:00
Rolf Neugebauer
8dcddf6be4
Merge pull request #3126 from djs55/logwrite-extension
memlogd/logwrite: use the same naming convention as init
2018-07-20 20:08:44 +01:00
David Scott
d6e7fb9549 Update yaml to linuxkit/memlogd:ba4fcf55c35a3833546a1e39125bf0fa940327b0
Signed-off-by: David Scott <dave.scott@docker.com>
2018-07-20 17:06:15 +01:00
Rolf Neugebauer
eede8a5dc7
Merge pull request #3125 from rn/auth
Enable 'linuxkit build' with private repositories and registries
2018-07-20 16:47:26 +01:00