Commit Graph

795 Commits

Author SHA1 Message Date
Daniel J Walsh 60644e7a72 Comment out all fields in containers.conf by default
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2019-12-11 08:26:52 -05:00
Daniel J Walsh 67213c41a3 Remove merge code and optional handling
Fix handling of toml files

No longer need merge, since we can specify a default conf for each toml file.
The toml code will retain the previous defaults and only use the newly specified
values.

This greatly simplifies the code.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2019-12-11 08:26:52 -05:00
Daniel J Walsh 5e5d5bc442 Merge pull request #25 from rhatdan/optional
Change optional bools to be private options
2019-12-09 12:23:30 -05:00
Daniel J Walsh 547b101e3e Change optional bools to be private options
We want to hide Optional Bools from the default configuration.  Callers should only have to deal with boolean
fields and not deal with optionals.

Add accessor functions for all optional bools, easier.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2019-12-09 12:01:43 -05:00
Daniel J Walsh 499912e0a9 Merge pull request #24 from rhatdan/master
Add support for CONTAINERS_CONF environment variable
2019-12-08 07:06:08 -05:00
Daniel J Walsh dfb351a9da Add support for CONTAINERS_CONF environment variable
This is needed to help in CI/CD systems to use an alternative containers.conf file for testing.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2019-12-07 06:20:27 -05:00
Daniel J Walsh 392841f989 Merge pull request #20 from QiWang19/libpodconf
Add libpod.conf to containers.conf
2019-12-07 05:36:00 -05:00
Qi Wang 894913abdf add libpod.conf to containers.conf
Add configurations from libpod.conf to containers.conf.Use merge code from libpod to read and merge configurations from file.

Add unshare_linux for build linux: HomeDir should buildah not only for linux. so add unshare_linux for linux and unshare.go for other

convert bool to optinalbool:Use OptionalBool for on-disk configurations so we can distinguish field is undefined  vs. user set to false.

Signed-off-by: Qi Wang <qiwan@redhat.com>
2019-12-06 15:55:47 -05:00
Daniel J Walsh 71fb957e51 Merge pull request #23 from rhatdan/master
Bump to v0.0.3
2019-12-06 06:28:26 -05:00
Daniel J Walsh 33274b9dc1 Move to v0.0.4-dev
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2019-12-06 06:26:02 -05:00
Daniel J Walsh 49ac5eac1a Bump to v0.0.3
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2019-12-06 06:25:33 -05:00
Daniel J Walsh 197794cc81 Merge pull request #22 from QiWang19/podman_cgroup
move cgroups pkg from libpod
2019-12-06 06:22:07 -05:00
Qi Wang aab667743b move cgroups pkg from libpod
move cgroups package from libpod so can be shared by Buildah and Podman.

Signed-off-by: Qi Wang <qiwan@redhat.com>
2019-12-05 12:09:11 -05:00
Valentin Rothberg c099b3a8f7 Merge pull request #21 from vrothberg/homedir
unshare.HomeDir: get home dir of current user
2019-11-22 15:20:15 +01:00
Valentin Rothberg 66d9591d6f unshare.HomeDir: get home dir of current user
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2019-11-22 11:18:27 +01:00
Daniel J Walsh ca9b6975b7 Merge pull request #17 from vrothberg/fix-15
Fix 15
2019-11-18 11:00:42 -05:00
Valentin Rothberg d451ba12b8 delete _output
Delete the empty _output directory which has been mistakenly added by a
previous commit.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2019-11-18 10:44:36 +01:00
Valentin Rothberg 7e703afe81 add Apache 2.0 license file
When creating the repository, we forgot to add the license file.

Fixes: containers/common#15
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2019-11-18 10:41:54 +01:00
Daniel J Walsh 07d07e862e Merge pull request #14 from QiWang19/rm_validate
turn off the check of the hooks directory
2019-11-11 12:50:20 -05:00
Qi Wang 023822b7b0 turn off the check of the hook directory
Signed-off-by: Qi Wang <qiwan@redhat.com>
2019-11-09 13:05:58 -05:00
Giuseppe Scrivano dfb227b0ce Merge pull request #13 from QiWang19/bump_v0.0.2
Bump to v0.0.2
2019-11-07 10:18:27 +01:00
Qi Wang dd9bff0e7e bump to 0.0.3-dev
Signed-off-by: Qi Wang <qiwan@redhat.com>
2019-11-06 16:20:29 -05:00
Qi Wang 189ce74efa bump to v0.0.2 2019-11-06 16:19:11 -05:00
Daniel J Walsh 6907822cde Merge pull request #12 from QiWang19/fix_ci
Fix tests failure #11
2019-11-06 16:02:14 -05:00
Qi Wang 64705d1f72 Fix tests failure #11
tests failures should be fixed since #11 add hooksdir to default config.

Signed-off-by: Qi Wang <qiwan@redhat.com>
2019-11-04 10:28:56 -05:00
Daniel J Walsh f977f74c2c Merge pull request #11 from QiWang19/default_pidslimit
change default value of pidslimit and hooksdir
2019-11-01 10:53:16 -04:00
Qi Wang 760d4a30a0 change default value of pidslimit and hooksdir
Change default value of pidslimit and hooksdir.
Add hooksdir to default config.

Signed-off-by: Qi Wang <qiwan@redhat.com>
2019-11-01 10:46:12 -04:00
Daniel J Walsh 0772db3ba6 Merge pull request #10 from QiWang19/selinux_unsupport
add selinux unsupported
2019-10-22 21:32:39 -04:00
Qi Wang 542afa60a4 add selinux unsupported
Add unsupported file for non linux.

Signed-off-by: Qi Wang <qiwan@redhat.com>
2019-10-22 13:51:22 -04:00
Valentin Rothberg c1e91d46ab Merge pull request #9 from QiWang19/addversion
Add VERSION file 0.0.1
2019-10-15 10:13:41 +02:00
Qi Wang 3edd342200 Bump to 0.0.2-dev
Signed-off-by: Qi Wang <qiwan@redhat.com>
2019-10-14 22:36:54 -04:00
Qi Wang c570a6832a Add VERSION file 0.0.1
Signed-off-by: Qi Wang <qiwan@redhat.com>
2019-10-14 10:41:07 -04:00
Daniel J Walsh c654d5f603 Merge pull request #8 from QiWang19/unshare_pkg
move pkg/unshare from buildah
2019-10-11 08:58:53 -04:00
Qi Wang 676d4298d3 move pkg/unshare from buildah
move the buildah/pkg/unshare into containers/common

Signed-off-by: Qi Wang <qiwan@redhat.com>
2019-10-10 22:35:31 -04:00
Valentin Rothberg 761432654d Merge pull request #7 from QiWang19/config
Add config package for containers.conf
2019-10-08 13:40:51 +02:00
Qi Wang 9bb8e7e62b Add config package for containers.conf
This PR adds a package config for reading configurations from the containers.conf into the go struct.

Signed-off-by: Qi Wang <qiwan@redhat.com>
2019-10-07 13:38:17 -04:00
Daniel J Walsh ddf2d69278 Update README.md 2019-09-18 09:40:23 -04:00
Valentin Rothberg b78fc892ad Merge pull request #6 from jwflory/fix/contributing-guidelines
Move contributing guidelines to correct path (closes #4)
2019-07-08 18:17:31 +02:00
Justin W. Flory 73b53f0bbe Use correct URL for contributing guidelines (closes #4)
I looked more closely and realized there were two CONTRIBUTING.md files
already in the repo. The file in `.github/` link to itself, so this
commit fixes the URL.

Closes #4.

Signed-off-by: Justin W. Flory <git@jwf.io>
2019-07-08 10:53:41 -05:00
Daniel J Walsh 92bd8c64f6 Merge pull request #3 from vrothberg/typo
fix typo + .github folder
2018-12-10 09:51:08 -05:00
Valentin Rothberg c02842a6e3 add .github dir
.github is a special directory for GitHub projects. The directory and
its files can serve as templates for projects under the
github.com/containers umbrella.

The following files are added:
- CONTRIBUTING.md
- ISSUE_TEMPLATE.md
- PULL_REQUEST_TEMPLATE.md

The underlying idea is that all three point to the main CONTRIBUTING.md
so we only need to update once and not for each project in the future.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2018-12-10 13:37:59 +01:00
Valentin Rothberg c58833851d fix typo
s/thi/the/

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2018-12-10 12:57:11 +01:00
Daniel J Walsh 1e030ecff4 Merge pull request #1 from TomSweeneyRedHat/dev/tsweeney/contrib
Add initial contributing for the Container's projects
2018-11-09 12:13:10 -05:00
TomSweeneyRedHat 75c67c0f6e Add initial contributing for the Container's projects
Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
2018-11-08 13:45:45 -05:00
Tom Sweeney 5c13c45725 Create README.md
Initial README.md to get the repository cranking.
2018-11-08 13:32:27 -05:00