vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
1500 commits 7 branches 27 tags 53 MiB
Commit graph

1500 commits

This branch
This branch
All branches
Author SHA1 Message Date
Daniel J Walsh
63a218a458 Move to new github.com/sirupsen/logrus. 
Need to mv to latest released and supported version of logrus
switch github.com/Sirupsen/logrus github.com/sirupsen/logrus

Also vendor in latest containers/storage and containers/image

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
 2017-08-07 11:50:04 -04:00
Mrunal Patel
816b15e07e Merge pull request #738 from rhatdan/1.6 
Remove testing with 1.6.
 2017-08-07 08:48:05 -07:00
Mrunal Patel
3b888a54d3 Merge pull request #720 from 14rcole/containerserver-integration 
Move functions in libkpod to ContainerServer
 2017-08-07 08:09:53 -07:00
Daniel J Walsh
7576620d2f Remove testing with 1.6. 
Some features cri-o is now using are not supported by golang 1.6.
All Distros that use CRI-O are now using golang 1.7 or better,
so no reason to test with this older version.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
 2017-08-07 10:56:33 -04:00
Mrunal Patel
5402f95d69 Merge pull request #736 from fntlnz/console-socket-tempdir 
conmon: Using `g_get_tmp_dir` to build the console socket name
 2017-08-07 07:28:46 -07:00
Lorenzo Fontana
e9e40c9df2
Using g_get_tmp_dir to build the console socket name 
Signed-off-by: Lorenzo Fontana <lo@linux.com>
 2017-08-06 17:26:14 +02:00
Mrunal Patel
dc3b6f4d78 Merge pull request #734 from mikkeloscar/buildtags-var 
build: Allow overwrite of BUILDTAGS variable
 2017-08-05 17:18:31 -07:00
Mikkel Oscar Lyderik Larsen
a747fa0c00
build: Allow overwrite of BUILDTAGS variable 
Signed-off-by: Mikkel Oscar Lyderik Larsen <m@moscar.net>
 2017-08-05 14:19:06 +02:00
Mrunal Patel
ef6e1e93f1 Merge pull request #729 from runcom/fix-build-2 
oci: fix build condition
 2017-08-04 19:32:27 -07:00
Mrunal Patel
ce8bd648de Merge pull request #730 from 14rcole/kpod-image-filter 
fix bug with creation time in ParseFilter()
 2017-08-04 19:24:37 -07:00
Mrunal Patel
03fdd4b188 Merge pull request #733 from 14rcole/kpod-copy-creds 
Allow password for docker registry to be inputted silently
 2017-08-04 12:22:19 -07:00
Ryan Cole
c6dc7d3e22 Fix bug resulting in kpod images --quiet only printing one image 
Signed-off-by: Ryan Cole <rcyoalne@gmail.com>
 2017-08-04 11:50:38 -04:00
Ryan Cole
0a62304adf fix bug with creation time in ParseFilter() 
Signed-off-by: Ryan Cole <rcyoalne@gmail.com>
 2017-08-04 11:46:43 -04:00
Ryan Cole
0d8f015675 Allow password for docker registry to be inputted silently 
Signed-off-by: Ryan Cole <rcyoalne@gmail.com>
 2017-08-04 09:35:36 -04:00
Antonio Murdaca
44e3b8de67 Merge pull request #731 from mrunalp/add_rhatdan 
Add rhatdan as an OWNER
 2017-08-04 14:00:47 +02:00
Antonio Murdaca
18a1a93e48 Merge pull request #724 from nalind/wrapped-errors 
Use errors.Cause() when looking at storage errors
 2017-08-04 12:00:25 +02:00
Mrunal Patel
d45d8fd3f4 Add rhatdan as an OWNER 
Signed-off-by: Mrunal Patel <mpatel@redhat.com>
 2017-08-03 19:33:02 -07:00
Nalin Dahyabhai
0b7348b35c Use errors.Cause() when looking at storage errors 
The storage library uses github.com/pkg/errors to wrap errors that it
returns from many of its functions, so when passing them to
os.IsNotExist() or comparing them to specific errors defined in the
storage library, unwrap them using errors.Cause().

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
 2017-08-03 15:40:54 -04:00
Antonio Murdaca
c24daefd3e
oci: fix build condition 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2017-08-03 20:20:38 +02:00
Ryan Cole
b1eb754ef5 Move functions in libkpod to ContainerServer 
Signed-off-by: Ryan Cole <rcyoalne@gmail.com>
 2017-08-03 13:05:44 -04:00
Mrunal Patel
d4f023918c Merge pull request #726 from nalind/glib2-ostree 
Build a fixed version of ostree in Travis
 2017-08-03 09:49:38 -07:00
Nalin Dahyabhai
d16625a603 Stick to a specific version of ostree in Travis 
When we build ostree for Travis, stick to version 2017.9 for now.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
 2017-08-03 10:56:28 -04:00
Mrunal Patel
66d96e77e3 Merge pull request #674 from runcom/additional-registries 
*: implement additional pull registries
 2017-08-02 17:42:58 -07:00
Antonio Murdaca
da176cd379 Merge pull request #717 from 14rcole/oci-getcontainer 
Allow oci memory store to match containers by id prefix or by name
 2017-08-02 16:55:36 +02:00
Antonio Murdaca
a35727c80b
*: implement additional pull registries 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2017-08-02 16:38:11 +02:00
Antonio Murdaca
7351786411 Merge pull request #713 from 14rcole/containerserver-update 
Make container server update it's list of containers upon creation
 2017-08-02 16:29:53 +02:00
Mrunal Patel
65f8fc850a Merge pull request #721 from rhatdan/atomic 
Remove atomic transport description.
 2017-08-01 10:13:17 -07:00
Ryan Cole
b56da85fc1 Make container server update it's list of containers upon creation 
Signed-off-by: Ryan Cole <rcyoalne@gmail.com>
 2017-08-01 11:44:57 -04:00
Daniel J Walsh
910064bf74 Remove atomic transport description. 
Miloslav informs me that the docker transport talking to an OpenShift
registry will handle signatures properly, so no need for the atomic transport
any longer.  We want to stop documenting it.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
 2017-08-01 11:41:52 -04:00
Mrunal Patel
d574177c2a Merge pull request #677 from mheon/state_lock_to_file 
Add option to use file-based locking for CRI-O state
 2017-08-01 07:32:50 -07:00
Ryan Cole
9ada0eb4e5 Allow containerserver to match containers by id prefix or name 
Signed-off-by: Ryan Cole <rcyoalne@gmail.com>
 2017-07-31 19:49:39 -04:00
Matthew Heon
9529f565b2 Add option to use file-based locking for libkpod state 
Signed-off-by: Matthew Heon <mheon@redhat.com>
 2017-07-31 15:58:29 -04:00
Mrunal Patel
fa6e2d81f9 Merge pull request #711 from mheon/rename_kpod_files 
Rename libkpod files to follow Go conventions
 2017-07-31 12:48:13 -07:00
Matthew Heon
4205b222a2 Rename libkpod files to follow Go conventions 
Signed-off-by: Matthew Heon <mheon@redhat.com>
 2017-07-31 10:11:40 -04:00
Mrunal Patel
3103524dea Merge pull request #707 from TomSweeneyRedHat/dev/tsweeney/docfix 
Make the kpod manpages a bit more uniform
 2017-07-30 07:53:22 -07:00
Mrunal Patel
0ae7443ee1 Merge pull request #668 from umohnani8/kpod_load 
Add kpod load
 2017-07-30 07:52:55 -07:00
TomSweeneyRedHat
b0fac5596c Make the kpod manpages a bit more uniform 
Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
 2017-07-29 13:26:21 -04:00
umohnani8
412b98be26 Add 'kpod load' command 
Signed-off-by: umohnani8 <umohnani@redhat.com>
 2017-07-28 22:30:48 -04:00
Mrunal Patel
79c5160e5a Merge pull request #700 from nalind/kpod-updates 
kpod: display image dates from inspection data, and don't display non-OCI settings in "inspect"
 2017-07-28 19:08:39 -07:00
Nalin Dahyabhai
5e97d2a1e2 libkpod: remove non-OCI information from inspect 
Remove the non-OCI version of the configuration structure, and the
parent image ID, from the ImageData that libkpod returns.

At runtime, cri-o is only ever going to use the OCI configuration
(possibly converted from another format by the image library) when
setting up a container, so it can be confusing to display settings in
"kpod inspect" that might be discarded when we try to run a container.

Remove the non-OCI version of the configuration structure, and the
hard-coded Type field, from the ContainerData that libkpod returns.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
 2017-07-28 16:58:12 -04:00
Nalin Dahyabhai
40117e8bfe Use inspected creation dates 
We already parse every image if there's a label filter so that we can
check against the filter, so when we do that, go ahead and read the
OCI-format configuration and inspection data as well, and use an image's
creation date as recorded in inspection data everywhere.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
 2017-07-28 16:58:12 -04:00
Mrunal Patel
1deb9795c3 Merge pull request #705 from 14rcole/kpod-save-config 
Switch kpod save to use config
 2017-07-28 13:51:31 -07:00
Ryan Cole
2cb57e0cb5 Switch kpod save to use config 
Signed-off-by: Ryan Cole <rcyoalne@gmail.com>
 2017-07-28 15:51:11 -04:00
Mrunal Patel
d2a82a28c1 Merge pull request #678 from umohnani8/kpod_save 
Add 'kpod save' command
 2017-07-28 10:49:49 -07:00
Mrunal Patel
5530764809 Merge pull request #702 from rhatdan/man 
remove kpod-push.1.md from wrong directory.
 2017-07-28 08:37:43 -07:00
Mrunal Patel
13c874753c Merge pull request #693 from 14rcole/libkpod-config 
add basic config struct to libkpod
 2017-07-28 06:24:45 -07:00
Daniel J Walsh
eace36ee64 kpod-push.1.md in wrong directory. 
Their is a kpod-push.1.md man page in docs directory.
This is a bogus location.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
 2017-07-28 10:53:44 +00:00
Ryan Cole
a8b6f2ad8a Update kpod commands to use getConfig() 
Make getStore() take a config struct from which it pulls the store
options, then update the kpod commands so that they call getConfig()
and pass the config into getStore()

Signed-off-by: Ryan Cole <rcyoalne@gmail.com>
 2017-07-27 15:58:55 -04:00
umohnani8
ff5eda509a Add 'kpod save' command 
Signed-off-by: umohnani8 <umohnani@redhat.com>
 2017-07-27 13:35:30 -04:00
Mrunal Patel
9dbd60a0df Merge pull request #698 from nalind/kpod-updates 
kpod: avoid digging into unpublished formats
 2017-07-27 10:20:46 -07:00