Commit Graph

88 Commits

Author SHA1 Message Date
James O. D. Hunt
f3e89d38a9 refactor: Simplify enabling debug
Simplify the logic to enable debug and also enable debug as early as
possible.

Signed-off-by: James O. D. Hunt <james.o.hunt@intel.com>
2018-04-19 15:55:34 +01:00
Eric Ernst
2b2b68d6fa
Merge pull request #63 from erick0z/erick0z/refactor_rootfs_script
rootfs-builder: Refactor rootfs.sh
2018-04-04 07:39:11 -07:00
James O. D. Hunt
1c45f4f666
Merge pull request #79 from nitkon/patch-1
initrd-builder: fix initrd image name
2018-04-04 13:51:15 +01:00
Nitesh Konkar
6930c24d14 initrd-builder: fix initrd image name
The initrd image name should be kata-containers-initrd.img,
as its referenced by this name later on.

Fixes #14

Signed-off-by: Nitesh Konkar <niteshkonkar@in.ibm.com>
2018-04-04 17:55:32 +05:30
Erick Cardona
52022701db rootfs-builder: Refactor rootfs.sh
This patch introduces a bash library (scripts/lib.sh) that concentrates
common functions. This also enhances future additions of other OSes, making
it more simple. Also, new variables were introduced in each distro config.sh
in order to parameterise the creation of package manager config (dnf/yum, in this case).
A fix to the resulting rootfs directory name (include OS name) is also fixed in this
patch.

Fixes #39
Fixes #34

Signed-off-by: Erick Cardona <erick.cardona.ruiz@intel.com>
2018-03-26 16:34:11 -06:00
Salvador Fuentes
ae8a849b32
Merge pull request #76 from grahamwhaley/20180323_tests_repo
ci: lib: allow override of tests_repo
2018-03-23 08:51:19 -06:00
Julio Montes
d469cffc7a
Merge pull request #75 from harche/env_args_docker
Pass EXTRA_PKGS var to docker to build rootfs
2018-03-23 08:40:13 -05:00
Graham whaley
93146d91dc ci: lib: allow override of tests_repo
Only set the tests_repo url to the default if it is not
set already.

Fixes: #71

Signed-off-by: Graham whaley <graham.whaley@intel.com>
2018-03-23 09:54:59 +00:00
Graham Whaley
ee4a91a60a
Merge pull request #73 from harche/golang_fix
Install the right golang binaries for ppc64le
2018-03-23 09:35:49 +00:00
Harshal Patil
2972a33535 rootfs: Install the right golang binaries for ppc64le
On ppc64le golang binaries should be pulled correctly

Fixes #72

Signed-off-by: Harshal Patil <harshal.patil@in.ibm.com>
2018-03-23 14:06:11 +05:30
Harshal Patil
7043e19671 rootfs: Pass EXTRA_PKGS var to docker to build rootfs
When docker is used for building rootfs the
EXTRA_PKGS should be passed as env var

Fixes #74

Signed-off-by: Harshal Patil <harshal.patil@in.ibm.com>
2018-03-23 14:02:13 +05:30
James O. D. Hunt
d0b3cf6d36
Merge pull request #70 from bergwolf/build
allow to build image and initrd based on existing rootfs
2018-03-22 16:39:16 +00:00
Peng Tao
6e1f2e063d Makefile: allow to build image and initrd based on existing rootfs
Just so that we do not have to re-build rootfs every time for local
build/testing.

Fixes: #69

Signed-off-by: Peng Tao <bergwolf@gmail.com>
2018-03-22 23:20:53 +08:00
Peng Tao
56ab8c99fe initrd-builder: fix ROOTFS_DIR typo
It should be just ROOTFS.

Signed-off-by: Peng Tao <bergwolf@gmail.com>
2018-03-22 23:18:07 +08:00
Julio Montes
0736e06193
Merge pull request #66 from jodh-intel/ci-fix-setup
CI: Make setup script fail on error
2018-03-20 09:36:13 -05:00
James O. D. Hunt
90d7b4dad6 CI: Make setup script fail on error
Run the `.ci/setup.sh` script with `set -e` to ensure all failures are
fatal.

Fixes #65.

Signed-off-by: James O. D. Hunt <james.o.hunt@intel.com>
2018-03-01 17:44:12 +00:00
James O. D. Hunt
6899dec884
Merge pull request #64 from nirmoy/fix_template_make
makefile: fix makefile to find Dockerfile.template
2018-03-01 17:41:12 +00:00
James O. D. Hunt
56eb88b8dd
Merge pull request #56 from liangchenye/time
skip euleros build due to timeout reason
2018-03-01 16:04:11 +00:00
Nirmoy Das
b21db8fc79 makefile: fix makefile to find Dockerfile.template
template rootfs creation fails:

$make -f template/Makefile ROOTFS_BASE_NAME=opensuse
<....>
sed: can't read Dockerfile.template: No such file or directory

make is unable to find Dockerfile.template, this patch fixes this.

Fixes #67.

Signed-off-by: Nirmoy Das <ndas@suse.de>
2018-02-26 11:24:49 +01:00
Liang Chenye
55f0324878 skip euleros build due to timeout reason
Fixes #46.

Signed-off-by: Liang Chenye <liangchenye@huawei.com>
2018-02-22 10:02:44 +08:00
James O. D. Hunt
ec738d46c1
Merge pull request #61 from devimc/rootfs/arm
rootfs-builder: ARM64 support
2018-02-19 09:35:14 +00:00
Jose Carlos Venegas Munoz
eb3712a075
Merge pull request #62 from erick0z/erick0z/image_size
image-builder: Allow to specify root partition free space
2018-02-15 21:41:21 -06:00
Erick Cardona
ea4063095d image-builder: Allow to specify root partition free space
There is no way to specify the remaining free space of the root partition.
It can vary depending on the upper bound size of the image aligned to 128MB
and the size of the root filesystem.
The following patch allow the user to specify that at least a certain amount
of space (defined in MB) will be kept in the root partition.

Fixes: #45

Signed-off-by: Erick Cardona <erick.cardona.ruiz@intel.com>
2018-02-14 14:52:25 -06:00
Jose Carlos Venegas Munoz
9699fe43a7
Merge pull request #58 from harche/bound_cond
scripts : handle 0 and negative root disk sizes
2018-02-09 07:50:05 -06:00
Julio Montes
cd3fbcf864 rootfs-builder: ARM64 support
Install the right version of golang depending of the host architecture

fixes #60

Signed-off-by: Julio Montes <julio.montes@intel.com>
2018-02-08 19:35:58 -06:00
Harshal Patil
132e812fe4 scripts : handle 0 and negative root disk sizes
When user manually specifies root disk image
size the value should be greater than 0.

Fixes : #57

Signed-off-by: Harshal Patil <harshal.patil@in.ibm.com>
2018-02-05 15:43:26 +05:30
James O. D. Hunt
916fe973e2
Merge pull request #53 from bergwolf/alpine
alpine rootfs support
2018-02-05 09:42:22 +00:00
Peng Tao
58d8f0b2b5 tests: add alpine image build tests
Signed-off-by: Peng Tao <bergwolf@gmail.com>
2018-02-05 17:18:52 +08:00
Peng Tao
c8403836c0 rootfs: add alpine rootfs support
Fixes: #52
Signed-off-by: Peng Tao <bergwolf@gmail.com>
2018-02-05 17:18:52 +08:00
Peng Tao
de6e4dc93f builder: fix agent binary path
kata agent is installed in `${ROOTFS}/usr/bin/` rather than `${ROOTFS}/bin/`.
It just happended to work because `bin` is a symlink to `usr/bin`, which
might not be true in some distros. So do not rely on it.

Signed-off-by: Peng Tao <bergwolf@gmail.com>
2018-02-05 17:18:52 +08:00
James O. D. Hunt
17e01fd32f
Merge pull request #49 from bergwolf/agent_init
Allow to use agent as init process and create initrd image based on rootfs
2018-02-05 09:11:17 +00:00
Jose Carlos Venegas Munoz
4ccd771de7
Merge pull request #30 from harche/image_size
scripts: Add an "auto-size" feature
2018-02-02 10:42:14 -06:00
Harshal Patil
5fe3f4ae0b scripts: Add an "auto-size" feature
Changed image-builder/image_builder.sh to
automatically calculate the size of the root disk

Fixes #25.

Signed-off-by: Harshal Patil <harshal.patil@in.ibm.com>
2018-02-02 14:32:09 +05:30
Peng Tao
f503e66dd7 doc: add initd term to top level readme
Signed-off-by: Peng Tao <bergwolf@gmail.com>
2018-02-02 10:01:22 +08:00
Peng Tao
9680f08ebf rootfs: support adding optional kernel modules
Caller of rootfs.sh can define `KERNEL_MODULES_DIR` as a kernel
module directory and then the directory will be copied to
`/lib/modules/` of the created rootfs. This allows additional
kernel modules to be put into rootfs image and initrd image.

Signed-off-by: Peng Tao <bergwolf@gmail.com>
2018-02-01 23:27:40 +08:00
Peng Tao
7245b21206 rootfs: document about AGENT_INIT
Signed-off-by: Peng Tao <bergwolf@gmail.com>
2018-02-01 23:27:40 +08:00
Peng Tao
85a9a4a7be CI: enable agent as init process and kata initrd tests
1. let travis build w/ and w/o agent as init process
2. test building kata initrd images

Signed-off-by: Peng Tao <bergwolf@gmail.com>
2018-02-01 23:27:40 +08:00
Peng Tao
2a2a79aa87 centos: clean up yum caches after installing packages
So that we can get smaller rootfs.

Signed-off-by: Peng Tao <bergwolf@gmail.com>
2018-02-01 23:27:40 +08:00
Peng Tao
82759dac14 initrd: add script to build kata initrd image
Build a kata initrd image based on rootfs created by rootfs.sh.

Fixes: #5

Signed-off-by: Peng Tao <bergwolf@gmail.com>
2018-02-01 23:27:36 +08:00
Peng Tao
97c7e4b7bf config.sh: do not install systemd if agent is init
When agent is used as init process, there is no need to install
systemd.

Signed-off-by: Peng Tao <bergwolf@gmail.com>
2018-02-01 22:58:57 +08:00
Jose Carlos Venegas Munoz
0532e91d4b
Merge pull request #55 from liangchenye/master
add travis build status to README.md
2018-02-01 08:11:37 -06:00
Liang Chenye
33c48db758 add travis build status to README.md
Fixes:#54.
Signed-off-by: Liang Chenye <liangchenye@huawei.com>
2018-02-01 18:47:25 +08:00
Jose Carlos Venegas Munoz
1c504c7746
Merge pull request #51 from ydjainopensource/minimalContributing
Docs : Add minimal contribution guidelines
2018-01-30 12:48:08 -06:00
Peng Tao
94e7b1da4f rootfs: allow to use agent as init process
Add AGENT_INIT env to make it configurable.

Signed-off-by: Peng Tao <bergwolf@gmail.com>
2018-01-31 00:59:29 +08:00
Yash Jain
3e48c306c4 Docs : Add minimal contribution guidelines
Fixes : #50

See : kata-containers/community#5

Signed-off-by: Yash Jain <ydjainopensource@gmail.com>
2018-01-30 22:01:48 +05:30
Jose Carlos Venegas Munoz
058cf5bfca
Merge pull request #13 from jodh-intel/ci-add-checkcommits
CI: Enable checkcommits
2018-01-29 09:52:30 -06:00
James O. D. Hunt
895aad108e CI: Enable checkcommits
Require all PRs to contain a "Fixes #XXX" comment and a
"Signed-off-by:" comment by running the central static checks script.

Note that the static checks script will detect if the repository
contains golang code and only run those checks if it does.

Fixes #12.

Signed-off-by: James O. D. Hunt <james.o.hunt@intel.com>
2018-01-29 08:50:55 +00:00
Peng Tao
1295bd50f7
Merge pull request #40 from jcvenegas/fixes
CI: Fix tests
2018-01-27 11:10:04 +08:00
Jose Carlos Venegas Munoz
45d4e5fb62 travis: Wait more than 10 min
Use travis configuration to wait more than 10 min

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2018-01-26 11:04:57 -06:00
James O. D. Hunt
00d26de0d5
Merge pull request #37 from jodh-intel/fix-image-builder-instructions
docs: Fix image builder instructions.
2018-01-25 17:04:12 +00:00