Commit Graph

160 Commits

Author SHA1 Message Date
Daniel J Walsh a10366adef Drop depracated warnings to debug
Currently podman ships with libpod.conf,  We need to remove the noice
for these warnings from buildah for the time being.  We can fix this
once podman is shipping without libpod.conf.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-03-10 10:35:33 -04:00
Daniel J Walsh 0b81b655d3 Merge pull request #83 from rhatdan/version
Version
2020-03-10 08:22:38 -04:00
Daniel J Walsh 7630f4ffc2 Move to v0.4.4-dev
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-03-10 08:21:47 -04:00
Daniel J Walsh 52b624fd7d Bump to v0.4.3
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-03-10 08:21:47 -04:00
Daniel J Walsh 4503c2b249 Merge pull request #81 from rhatdan/master
NewConfig(): passed-in configuration file should matter most
2020-03-10 08:19:44 -04:00
Daniel J Walsh 357a5402c6 NewConfig(): passed-in configuration file should matter most
In NewConfig(), settings in the file whose name we're passed should
matter more than the hardwired default files, or the file named in the
CONTAINERS_CONF environment variable.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-03-09 17:29:26 -04:00
Daniel J Walsh 66647dd5c2 Merge pull request #80 from QiWang19/rm_cgroup_check
remove CgroupsAndAdjust from NewConfig
2020-03-09 16:59:22 -04:00
Qi Wang eee0f4f7f8 remove CgroupsAndAdjust from NewConfig
Export CheckCgroupsAndAdjustConfig() as global function and remove it from NewConfig(). So we can handle it in libpod and avoid Buildah to display cgroup warning message when reading containers.conf.

Signed-off-by: Qi Wang <qiwan@redhat.com>
2020-03-09 15:18:15 -04:00
Daniel J Walsh 7508a6e72d Merge pull request #78 from QiWang19/merge_libpodconf
Support and prefer libpod.conf if exists
2020-03-09 14:57:04 -04:00
Qi Wang 0c613a6abe Support and prefer libpod.conf if exists
During the transision period of replacing libpod.conf with containers.conf, pkg/config should also read the libpod.conf if it exist.
This patch reads the libpod.conf in NewConfig() and converts the configurations to ContainersConfig Struct.

Signed-off-by: Qi Wang <qiwan@redhat.com>
2020-03-09 14:37:19 -04:00
Daniel J Walsh 8ce8607656 Merge pull request #77 from QiWang19/run-pull
Add pull_policy to LibpodConfig
2020-03-03 14:40:06 -05:00
Qi Wang bec93b6703 Add pull_policy to LibpodConfig
pull_policy is the same as podman run --pull option to determin whether to pull a new image when running a container.
Accepted "always", "missing", and "never". Default value is "missing".

Signed-off-by: Qi Wang <qiwan@redhat.com>
2020-03-03 11:13:38 -05:00
Daniel J Walsh e8b6b7cfd1 Merge pull request #76 from rhatdan/vendor
Bump to v0.4.2
2020-02-25 06:25:48 -05:00
Daniel J Walsh 910ac95f7a Move to v0.4.3-dev
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-02-25 07:13:05 -04:00
Daniel J Walsh e261997afd Bump to v0.4.2
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-02-25 07:12:42 -04:00
Daniel J Walsh d99cf98866 Merge pull request #75 from rhatdan/caps
list of label specification for required capabilities
2020-02-25 06:11:48 -05:00
Daniel J Walsh 112e5a7b20 list of label specification for required capabilties
These labels allows users to specify the list of capabilities required
to run their container image.

Setting a image/container label "io.containers.capabilities=setuid,setgid"
will tell container engines that the contained image should work fine withi
just these two capabilties, instead of running with the default capabilities,

Defined as a list, since this has not been standardized yet, we want to make
this a standard, and the standard label might be different then the label we
choose, so eventually we might need to add a standard label.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-02-23 06:19:35 -05:00
Daniel J Walsh d8ecc3ce53 Merge pull request #74 from rhatdan/vendor
Vendor
2020-02-21 14:12:33 -05:00
Daniel J Walsh 0e8e98c5f3 Move to v0.4.2-dev
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-02-21 12:58:40 -05:00
Daniel J Walsh d592faeb27 Bump to v0.4.1
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-02-21 12:58:20 -05:00
Daniel J Walsh fc78240745 Merge pull request #72 from rhatdan/stoptimeout
Add StopTimeout for podman
2020-02-21 12:57:36 -05:00
Daniel J Walsh 00b0aae703 Add StopTimeout for podman
Allow users to modify the default ammount of time to wait to send SIGKILL
after you tell a container to stop with a SIGINT.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-02-21 11:32:16 -05:00
Daniel J Walsh 5725c54f72 Merge pull request #73 from rhatdan/vendor
Update vendor of SELinux and containers/storage
2020-02-21 11:26:35 -05:00
Daniel J Walsh 863988d2af Update vendor of SELinux and containers/storage
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-02-21 10:32:11 -05:00
Daniel J Walsh 79e525d832 Merge pull request #71 from rhatdan/version
Version
2020-02-20 17:12:39 -05:00
Daniel J Walsh f725dc4ba7 Move to v0.4.1-dev
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-02-20 15:08:13 -05:00
Daniel J Walsh 2b628aea6a Bump to v0.4.0
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-02-20 15:07:49 -05:00
Daniel J Walsh 14487089a0 Merge pull request #70 from rhatdan/cgroup_manager
CgroupManager should belong to libpod not containers
2020-02-20 12:00:39 -05:00
Daniel J Walsh 3d6b785749 CgroupManager should belong to libpod not containers
CgroupManager is defined for managing containers, it is not defined
per container.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-02-20 10:27:47 -05:00
Daniel J Walsh 8bd736f5cc Merge pull request #69 from giuseppe/add-setfcap
config: add CAP_SETFCAP to the default capabilities
2020-02-20 09:39:18 -05:00
Daniel J Walsh c5a69104d7 Merge pull request #68 from rhatdan/additional
Remove additional_ adjective from containers.conf
2020-02-20 09:35:20 -05:00
Giuseppe Scrivano b1841747ed config: add CAP_SETFCAP to the default capabilities
it is needed by Buildah to set file capabilities.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2020-02-20 09:49:01 +01:00
Daniel J Walsh ad4b16c9d2 Remove additional_ adjective from containers.conf
Additional is implied, so should not be stated.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-02-19 09:48:11 -05:00
Daniel J Walsh 56c6f79938 Merge pull request #67 from rhatdan/version
Bump to v0.3.0
2020-02-18 14:38:28 -05:00
Daniel J Walsh 9a542c8128 Move to v0.3.1-dev
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-02-18 14:32:31 -05:00
Daniel J Walsh 8cf0d848e4 Bump to v0.3.0
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-02-18 14:32:04 -05:00
Daniel J Walsh 862583d397 Merge pull request #63 from ArangoGutierrez/issue_62
Add annotations into containers.conf file
2020-02-18 14:30:43 -05:00
Daniel J Walsh 6161b218de Merge pull request #65 from vrothberg/capabilities
pkg/capabilities
2020-02-18 14:00:55 -05:00
Valentin Rothberg 2a58a0e73b rm _output dir
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2020-02-18 15:58:33 +01:00
Valentin Rothberg 130c712a05 pkg/capabilities
Replace pkg/caps with pkg/capabilities (from libpod).  It's also a fork
from Docker but attributes its origing with copyright notes and has a
trimmed down (and faster) API.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2020-02-18 15:58:19 +01:00
Carlos Eduardo Arango Gutierrez a93c9e5022 fix typo on var declaration
Signed-off-by: Carlos Eduardo Arango Gutierrez <carangog@redhat.com>
2020-02-18 07:19:27 -05:00
Carlos Eduardo Arango Gutierrez 3e885a69c4 Add annotations into containers.conf file
Closes #62

Signed-off-by: Carlos Eduardo Arango Gutierrez <carangog@redhat.com>
2020-02-17 19:42:11 -05:00
Carlos Eduardo Arango Gutierrez 0d15312d27 Fix lint on default.go
Signed-off-by: Carlos Eduardo Arango Gutierrez <carangog@redhat.com>
2020-02-17 18:18:14 -05:00
Carlos Eduardo Arango Gutierrez be1f3f6caa fix gofmt on file config_test.go
apply `gofmt -s -w config_test.go`

Signed-off-by: Carlos Eduardo Arango Gutierrez <carangog@redhat.com>
2020-02-17 18:13:03 -05:00
Carlos Eduardo Arango Gutierrez 6309277061 Fix misspell on config.go
Line 255:"guarantess" is a misspelling of "guarantees" (misspell)
Line 292:"guarantess" is a misspelling of "guarantees" (misspell)
rm some double spaces

Signed-off-by: Carlos Eduardo Arango Gutierrez <carangog@redhat.com>
2020-02-17 18:10:26 -05:00
Daniel J Walsh ff0d6f4f28 Merge pull request #61 from rhatdan/version
bump to v0.2.1
2020-02-13 05:13:05 -05:00
Daniel J Walsh c16be50d41 Move to v0.2.2-dev
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-02-13 05:12:16 -05:00
Daniel J Walsh 2b91b7d58e Bump to v0.2.1
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-02-13 05:11:53 -05:00
Giuseppe Scrivano 853bd2fcc0 Merge pull request #60 from rhatdan/version
Use slirp4netns for default network when in rootless mode
2020-02-13 10:04:00 +01:00
Daniel J Walsh a0f632a9d3 Use slirp4netns for default network when in rootless mode
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-02-12 21:11:56 -05:00