github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-21 10:09:07 +00:00
Code Issues Projects Releases Wiki Activity
199 Commits 1 Branch 27 Tags 240 MiB
e8dc61e910
Commit Graph

199 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin Cormack
e8dc61e910 Merge pull request #48 from justincormack/dir-fixes 
Fix build in directory
 2017-05-26 15:28:18 +01:00
Justin Cormack
b8cdb985fd Fix build in directory 
Remove unnecessary argument to buildInternal function, does not need to know the name.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-05-26 15:22:12 +01:00
Justin Cormack
2cd3a5b141 Merge pull request #47 from justincormack/dir 
Add a -dir option for location of output files
 2017-05-26 15:02:29 +01:00
Justin Cormack
f73558a98a Add a -dir option for location of output files 
Fix #17

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-05-26 14:53:17 +01:00
Justin Cormack
5de12a0085 Merge pull request #46 from justincormack/gitignore 
Fix gitignore to not ignore moby directory
 2017-05-26 14:47:45 +01:00
Justin Cormack
27709ce1c0 Fix gitignore to not ignore moby directory 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-05-26 14:45:19 +01:00
Justin Cormack
1cb9fab3e1 Merge pull request #45 from justincormack/clean 
Add make clean, .gitignore
 2017-05-26 13:34:06 +01:00
Justin Cormack
f6b9076649 Merge pull request #43 from justincormack/outputs-not-in-yaml 
Remove output formats from the Yaml file, put in CLI
 2017-05-26 13:33:17 +01:00
Justin Cormack
cbbedbfc57 Remove output formats from the Yaml file, put in CLI 
This removes outputs from yaml, instead you can do
```
moby build -output tar -output qcow2 file.yaml
```
or alternative syntax
```
moby build -output tar,qcow2 file.yaml
```

In future we may change this to be available in a `moby package`
step, but lets try this for now.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-05-26 13:00:45 +01:00
Justin Cormack
dfd1cd9c1c Add make clean, .gitignore 
Also tidy Makefile a bit

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-05-26 12:47:06 +01:00
Justin Cormack
f65146c844 Merge pull request #41 from riyazdf/remove-run 
Remove docker run function as it is unused
 2017-05-26 10:43:56 +01:00
Justin Cormack
ff4a19c5fb Merge pull request #44 from AkihiroSuda/fix-tmpfs 
config: fix tmpfs parsing
 2017-05-26 10:42:22 +01:00
Akihiro Suda
41c536908d config: fix tmpfs parsing 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2017-05-26 08:24:48 +00:00
Riyaz Faizullabhoy
dfca3b9775 Remove docker run function as it is unused 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
 2017-05-23 13:30:29 -07:00
Justin Cormack
b47f3dec4a Merge pull request #27 from chanwit/add_source 
add Source attribute to File
 2017-05-22 11:28:06 +01:00
Justin Cormack
339aa5ec86 Merge pull request #39 from justincormack/nullable 
Add support for override of parameters using a label
 2017-05-18 23:09:37 +01:00
Justin Cormack
c734b47e9c Add support for override of parameters using a label 
Using the label `org.mobyproject.config` will use that JSON
(or yaml, but it is very hard to get yaml into a label as newlines are
not respected) for parameters that are not explicitly set in the yaml file.

Had to change parameter definitions so override behaves as expected.

fix #16

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-05-18 17:48:15 +01:00
Justin Cormack
df7f50a755 Merge pull request #37 from riyazdf/circle-fix 
Fixup circle CI
 2017-05-15 19:59:51 +01:00
Riyaz Faizullabhoy
57f1a5bdf2 Fixup circle CI 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
 2017-05-15 11:55:53 -07:00
Justin Cormack
219847ff1a Merge pull request #36 from riyazdf/fix-circle 
Update working dir and get golint for circle tests
 2017-05-15 18:25:45 +01:00
Riyaz Faizullabhoy
62f8a69b38 Update working dir and get golint for circle tests 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
 2017-05-15 10:17:16 -07:00
Justin Cormack
b48e969bf8 Merge pull request #34 from riyazdf/simple-test 
Simple test target
 2017-05-15 17:59:22 +01:00
Riyaz Faizullabhoy
039e4f6f60 Change to tar output 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
 2017-05-15 09:58:26 -07:00
Justin Cormack
d7611ee0e3 Merge pull request #35 from justincormack/windows-fixes 
Update vendoring for Windows support
 2017-05-15 17:36:29 +01:00
Justin Cormack
5a226337a9 Update vendoring for Windows support 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-05-15 17:32:10 +01:00
Riyaz Faizullabhoy
d020a54aa7 Sample circle yml, not hooked in yet 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
 2017-05-15 09:27:34 -07:00
Riyaz Faizullabhoy
39d74773fc Simple make test target 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
 2017-05-15 09:27:29 -07:00
Justin Cormack
a9a00fae62 Merge pull request #33 from justincormack/img-gz 
Add a compressed disk image format
 2017-05-12 14:43:13 +01:00
Justin Cormack
1274f81f81 Add a compressed disk image format 
This is a fairly generic bootable disk with syslinux. Should
work if you dd it onto a USB stick, and should also work for AWS.

You need to uncompress it of course! Default size is 1G.

Will add cli option to set the size once I split out `moby build`
and `moby package` shortly.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-05-12 14:29:14 +01:00
Justin Cormack
1135cdddcc Merge pull request #32 from justincormack/fix-pull 
Fix docker pull
 2017-05-12 13:08:17 +01:00
Justin Cormack
0ade84e151 Fix docker pull 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-05-12 13:04:19 +01:00
Justin Cormack
91e78b73b9 Merge pull request #31 from justincormack/fix-exec 
Add missing import
 2017-05-12 11:42:03 +01:00
Justin Cormack
8a71fbdbb6 Add missing import 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-05-12 11:41:37 +01:00
Justin Cormack
9afbc24c79 Merge pull request #30 from riyazdf/revert-run-api 
Revert "Use Docker API for run"
 2017-05-12 11:31:33 +01:00
Justin Cormack
4bef9648f9 Merge pull request #18 from riyazdf/docker-pull-api 
implement docker pull using docker API + notary library
 2017-05-12 11:30:49 +01:00
Riyaz Faizullabhoy
e26f2878d3 Revert "Use Docker API for run" 
This reverts commit ec6fea1d67.
 2017-05-11 17:32:32 -07:00
Chanwit Kaewkasi
d83c35259a add Source attribute to File 
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
 2017-05-12 01:01:53 +07:00
Riyaz Faizullabhoy
9afeda3c78 Vendoring for notary 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
 2017-05-11 10:11:38 -07:00
Riyaz Faizullabhoy
abf0028ee8 Use docker and notary API for pull 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
 2017-05-11 10:11:19 -07:00
Justin Cormack
ba07bbfb0d Merge pull request #26 from justincormack/gitignore-del 
Remove .gitignore
 2017-05-10 17:00:17 +01:00
Justin Cormack
0ea9dfdfe1 Remove .gitignore 
Was ignoring too much...

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-05-10 16:59:25 +01:00
Justin Cormack
11b913606d Merge pull request #11 from riyazdf/run-api 
Use Docker API for run
 2017-05-09 16:31:57 +01:00
Justin Cormack
0a06eb2cea Merge pull request #25 from justincormack/fix-symlinks-misc 
Fix symlinks handling in initramfs
 2017-05-09 13:54:17 +01:00
Justin Cormack
fbdd5047dd Update linuxkit vendor 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-05-09 13:45:48 +01:00
Justin Cormack
6187570b7a Add missing Close in initrd creation 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-05-09 13:34:41 +01:00
Justin Cormack
cc2a3a645f Add support for symlinks in files section 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-05-09 13:15:11 +01:00
Justin Cormack
96ae98d2d5 Do not log information about empty sections 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-05-09 13:12:51 +01:00
Justin Cormack
e25033f70d Allow no kernel to be specified 
This is needed for non LinuxKit use cases.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-05-09 13:03:58 +01:00
Justin Cormack
a1b24b4de2 Merge pull request #24 from MagnusS/fix-build 
Don't exit after pulling init or kernel image without -pull
 2017-05-08 20:14:03 +01:00
Magnus Skjegstad
09c2904994 Don't exit after pulling init or kernel image 
Due to a missing else the tool would previously terminate with an error
message showing that the kernel or init image didn't exist, even if it
was pulled successfully. Invoking the tool again would continue to the
next image.

Signed-off-by: Magnus Skjegstad <magnus@skjegstad.com>
 2017-05-08 20:48:20 +02:00