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

1902 commits

This branch
This branch
All branches
Author SHA1 Message Date
Daniel J Walsh
dce6f3c2ef
Merge pull request #1100 from rhatdan/args 
Report error when arguments given to crio command
 2017-11-01 08:03:18 -04:00
Daniel J Walsh
063b25cef5 Report error when arguments given to crio command 
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
 2017-10-31 16:15:54 -04:00
Mrunal Patel
4c06116c18
Merge pull request #654 from nalind/storage-update 
Do not merge: Bump containers/storage and containers/image
 2017-10-31 10:31:26 -07:00
Nalin Dahyabhai
2e5e92730a Switch to ImageServer.UntagImage in RemoveImage handler 
Add an UntagImage() method to pkg/storage/ImageServer, which will check
if the passed-in NameOrID is a name.  If so, it merely removes that name
from the image, removing the image only if it was the last name that the
image had.  If the NameOrID is an image ID, the image is removed, as
RemoveImage() does.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
 2017-10-31 10:30:18 -04:00
Nalin Dahyabhai
3f2bc09231 Return image references in ImageStatus() 
The image's canonical reference is a name with a digest of the image's
manifest, so compute and return that value as the image's reference in
ImageStatus() and in ContainerStatus().

We don't auto-store a name based on the image digest when we pull one by
tag, but then CRI doesn't need us to do that.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
 2017-10-31 10:29:06 -04:00
Nalin Dahyabhai
beef44840e Update kpod push test 
Since we've got stable image IDs now, pushing an image from local
storage to local storage ends up attaching the both names to a single
image, so we need to update the test's expectations.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
 2017-10-31 10:29:05 -04:00
Nalin Dahyabhai
9dab0eee24 Remove dead code 
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
 2017-10-31 10:29:05 -04:00
Nalin Dahyabhai
88deb3934f Update PushImage() for newer containers/image 
The updated containers/image and containers/storage don't require as
many workarounds to be able to push images.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
 2017-10-31 10:29:05 -04:00
Nalin Dahyabhai
1346755565 Bump containers/image and containers/storage 
Update to proposed changes in containers/image, and bump
containers/storage to 04ad0b827097209ca65e59b5fd768511f3b1ae91, which is
currently the tip of the master branch.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
 2017-10-31 10:29:05 -04:00
Daniel J Walsh
c5e73ba65f
Merge pull request #1085 from jasonbrooks/patch-1 
add golang-github-cpuguy83-go-md2man dep
 2017-10-31 10:27:19 -04:00
Daniel J Walsh
051cafbd62
Merge pull request #1095 from TomSweeneyRedHat/dev/tsweeney/docfix/12 
Change runc location of runc in tutorial.md
 2017-10-31 10:26:37 -04:00
Daniel J Walsh
dbaf500c0b
Merge pull request #1094 from runcom/makefile-fixes 
Makefile: output binaries under bin/
 2017-10-31 09:07:40 -04:00
Antonio Murdaca
63b1706de8
Makefile: output binaries under bin/ 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2017-10-30 17:48:29 +01:00
Daniel J Walsh
f6555bd868
Merge pull request #1087 from runcom/sort-mounts 
container_create: sort mounts before adding them to the spec
 2017-10-30 12:40:00 -04:00
Jason Brooks
fad19c8082 add golang-github-cpuguy83-go-md2man dep 
Signed-off-by: Jason Brooks <jbrooks@redhat.com>

On CentOS, I needed this for `make` build step to complete
 2017-10-30 08:33:41 -07:00
TomSweeneyRedHat
cbb380c974 Change runc location of runc in tutorial.md 
Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
 2017-10-30 09:50:49 -04:00
Daniel J Walsh
e22a3c9aea
Merge pull request #1090 from runcom/cmux-http-read-timeout 
cmd: crio: set ReadTimeout on the info endpoint
 2017-10-30 09:08:36 -04:00
Antonio Murdaca
158d53e62a
cmd: crio: set ReadTimeout on the info endpoint 
This will avoid the goroutines leak we've been seeing during
performance tests. Goroutines count returns to normal after containers
cleanup.

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2017-10-29 21:56:55 +01:00
Antonio Murdaca
15afc4d3de
container_create: sort mounts before adding them to the spec 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2017-10-29 12:31:18 +01:00
Antonio Murdaca
3ae3c41256
Merge pull request #1086 from mrunalp/lint_fix 
lint fixes
 2017-10-29 06:13:21 +01:00
Mrunal Patel
03f9350a15 lint fixes 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
 2017-10-28 13:17:00 -07:00
Daniel J Walsh
c269bf7b99
Merge pull request #1081 from mheon/libpod_labels 
Update libpod to support labels
 2017-10-27 12:34:14 -07:00
Mrunal Patel
c54658cb7b
Merge pull request #1083 from lsm5/unitfile-fixes 
expand limits for tests
 2017-10-27 10:25:12 -07:00
Lokesh Mandvekar
74f744dc34
systemd: expand limits for tests 
Borrowed from:
https://github.com/projectatomic/atomic-system-containers/pull/136

From: Antonio Murdaca <runcom@redhat.com>
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
 2017-10-27 10:50:02 -04:00
Matthew Heon
90b44cbf34 Shut down libpod runtime's store if error occurs in NewRuntime 
Signed-off-by: Matthew Heon <mheon@redhat.com>
 2017-10-27 09:50:09 -04:00
Daniel J Walsh
596a97119b Merge pull request #1043 from mheon/kpod_container_skeleton 
Libpod container creation logic
 2017-10-26 16:26:06 -07:00
Mrunal Patel
1442bb7ed7 Merge pull request #1076 from runcom/close-ch 
server: correctly return and close ch from exits routine
 2017-10-26 11:00:42 -07:00
Matthew Heon
97ad00b708 Add labels and stop signal to libpod's container code 
Signed-off-by: Matthew Heon <mheon@redhat.com>
 2017-10-26 11:13:42 -04:00
Antonio Murdaca
584a256388
server: correctly return and close ch from exits routine 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2017-10-26 16:55:18 +02:00
Mrunal Patel
b416ee13a0 Merge pull request #1074 from umohnani8/pull_flags 
Add --tls-verify, --cert-dir, and --quiet flags to kpod pull
 2017-10-25 18:52:50 -07:00
umohnani8
f9992d71a3 Add --tls-verify, --cert-dir, and --quiet flags to kpod pull 
Signed-off-by: umohnani8 <umohnani@redhat.com>
 2017-10-25 16:28:18 -04:00
Matthew Heon
1ef3e96974 Fix gofmt and golint issues 
Signed-off-by: Matthew Heon <mheon@redhat.com>
 2017-10-25 13:08:49 -04:00
Matthew Heon
3b60d38769 Address review comments 
Signed-off-by: Matthew Heon <mheon@redhat.com>
 2017-10-25 12:04:52 -04:00
Matthew Heon
9b563f7970 Update libpod logic for placing containers in pods 
Signed-off-by: Matthew Heon <mheon@redhat.com>
 2017-10-25 11:51:45 -04:00
Matthew Heon
88e2acdc4f Add create/start times. Add helpers for locating common files. 
Signed-off-by: Matthew Heon <mheon@redhat.com>
 2017-10-25 10:45:32 -04:00
Matthew Heon
3262565d61 Add support for setting conmon sockets directory in libpod 
Signed-off-by: Matthew Heon <mheon@redhat.com>
 2017-10-25 10:45:32 -04:00
Matthew Heon
872c59da8f Refactor container code in preparation for saving state 
Also adds terminal handling code to libpod

Signed-off-by: Matthew Heon <mheon@redhat.com>
 2017-10-25 10:45:32 -04:00
Matthew Heon
241653e152 Add container creation logic to Libpod 
Signed-off-by: Matthew Heon <mheon@redhat.com>
 2017-10-25 10:45:32 -04:00
Daniel J Walsh
8d78e3cfac Merge pull request #1072 from rhatdan/master 
Copy CONTRIBUTING.md from skopeo
 2017-10-25 07:30:07 -07:00
Daniel J Walsh
e92aec8b97 Merge pull request #1073 from rhatdan/readme 
Add ascii cinema to README for login/logout/diff
 2017-10-25 07:29:38 -07:00
Daniel J Walsh
fb804f5602 Merge pull request #1015 from umohnani8/authflag 
Add authfile flag to pull and push
 2017-10-25 06:16:58 -07:00
Daniel J Walsh
17ad51011e Add ascii cinema to README for login/logout/diff 
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
 2017-10-25 13:10:56 +00:00
Daniel J Walsh
14f111bd8d Copy CONTRIBUTING.md from skopeo 
We need to tell people about contributing to the CRI-O project

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
 2017-10-25 13:07:25 +00:00
Daniel J Walsh
a3cd7c422c Merge pull request #1052 from mheon/conmon_socket_as_arg 
Make attach sockets directory an argument in Conmon
 2017-10-24 21:48:33 -07:00
Daniel J Walsh
c9f837aca1 Merge pull request #1056 from literalice/patch-runcpath 
fixes runc install path on Dockerfile
 2017-10-24 21:47:24 -07:00
Daniel J Walsh
2e26e9b2ec Merge pull request #1050 from rhatdan/selinux 
We need to release the SELinux label when we destroy the sandbox
 2017-10-24 21:44:30 -07:00
Daniel J Walsh
2f43183c35 Merge pull request #1068 from nalind/default-store 
libpod: set the default Store to match a Runtime
 2017-10-24 21:40:56 -07:00
Mrunal Patel
e6d2d60e4d Merge pull request #1065 from nalind/mapsize 
Fix a copy/paste error in libpod initializers
 2017-10-24 21:02:36 -07:00
Mrunal Patel
cd04b45540 Merge pull request #1067 from nalind/secrets-test 
Fixups for crio_secrets.bats
 2017-10-24 21:01:56 -07:00
Mrunal Patel
5a4ffef9d3 Merge pull request #1066 from nalind/storage-opts 
tests: rename $STORAGE_OPTS to $STORAGE_OPTIONS
 2017-10-24 21:01:33 -07:00