Commit Graph

970 Commits

Author SHA1 Message Date
Tom Sweeney a0a02519cf Merge pull request #285 from openSUSE/golangci-lint
Update golangci-lint and add config
2020-08-25 10:43:32 -04:00
OpenShift Merge Robot 6b1a19f14c Merge pull request #286 from openSUSE/elseif
Fix nested elseif
2020-08-25 09:21:00 -04:00
Sascha Grunert b494081304 Change fmt.Errorf calls to be replaced by errors package
We now use wrapped errors instead of indirectly wrapping them by
`fmt.Errorf`. The error messages have also been cleaned-up to reduce
duplicate words like `failed`.

Signed-off-by: Sascha Grunert <sgrunert@suse.com>
2020-08-25 11:37:12 +02:00
Sascha Grunert 0141e99d65 Fix nested elseif
The nested elseif `else {if cond {}}` can be replaced with `else if cond
{}`.

Signed-off-by: Sascha Grunert <sgrunert@suse.com>
2020-08-25 11:31:53 +02:00
Sascha Grunert 7cad87d361 Update golangci-lint and add config
This also updates the target directory of the linter binary, which is
now inside the repository instead of `$GOBIN`.

Signed-off-by: Sascha Grunert <sgrunert@suse.com>
2020-08-25 11:20:54 +02:00
Giuseppe Scrivano 191f631584 Merge pull request #281 from rhatdan/master
getCustomConfigFile for windows and darwin
2020-08-24 14:56:43 +02:00
OpenShift Merge Robot e5ea066b38 Merge pull request #277 from QiWang19/retry-eof
Enable retry EOF from http request
2020-08-23 06:49:15 -04:00
Daniel J Walsh 69012df43d Update pkg/retry/retry.go
Co-authored-by: Miloslav Trmač <mitr@redhat.com>
2020-08-23 06:39:43 -04:00
Daniel J Walsh a288c7cb3a Update pkg/config/config_windows.go
Co-authored-by: Jhon Honce <jhonce@redhat.com>
2020-08-22 09:11:12 -04:00
Daniel J Walsh d208f7340c Update pkg/config/config_darwin.go
Co-authored-by: Jhon Honce <jhonce@redhat.com>
2020-08-22 09:11:12 -04:00
Daniel J Walsh 3bd8ddef5e Update pkg/config/config_linux.go
Co-authored-by: Jhon Honce <jhonce@redhat.com>
2020-08-22 09:11:12 -04:00
Brent Baude 054d133710 getCustomConfigFile for windows and darwin
podman remote clients that run on windows and darwin cannot use the isRootless to determine the configuration file locations.  here we do by OS and also honor the environment variable.

Signed-off-by: Brent Baude <bbaude@redhat.com>
2020-08-22 09:11:12 -04:00
Qi Wang 499c4ef5a7 Enable retry EOF from http request
If the *url.Error type error casued by EOF, enable to retry.

Signed-off-by: Qi Wang <qiwan@redhat.com>
2020-08-20 14:51:50 -04:00
OpenShift Merge Robot 0f5b7db0f3 Merge pull request #269 from openSUSE/apparmor_parser-binary-test
Validate that apparmor_parser is available on the system
2020-08-20 12:33:20 +02:00
Sascha Grunert b1670784f9 Add FindAppArmorParserBinary() helper
This function will be now used internally to get the correct path to the
`apparmor_parser` binary.

Signed-off-by: Sascha Grunert <sgrunert@suse.com>
2020-08-20 09:22:27 +02:00
OpenShift Merge Robot 0521a88a1f Merge pull request #272 from containers/dependabot/go_modules/github.com/containers/image/v5-5.5.2
Bump github.com/containers/image/v5 from 5.5.1 to 5.5.2
2020-08-19 21:34:20 +02:00
Daniel J Walsh 643de8e65c Bump github.com/containers/image/v5 from 5.5.1 to 5.5.2
Bumps [github.com/containers/image/v5](https://github.com/containers/image) from 5.5.1 to 5.5.2.
- [Release notes](https://github.com/containers/image/releases)
- [Commits](containers/image@v5.5.1...v5.5.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-08-19 13:02:05 -04:00
OpenShift Merge Robot 0bb4daecae Merge pull request #273 from ptalbert/syntax_fix
containers.conf: Fix ulimits nofile example syntax
2020-08-19 16:16:24 +02:00
OpenShift Merge Robot 5c5cc438e4 Merge pull request #271 from containers/dependabot/go_modules/github.com/containers/storage-1.23.1
Bump github.com/containers/storage from 1.23.0 to 1.23.1
2020-08-19 16:05:07 +02:00
Daniel J Walsh d06113ccc6 Bump github.com/containers/storage from 1.23.0 to 1.23.1
Bumps [github.com/containers/storage](https://github.com/containers/storage) from 1.23.0 to 1.23.1.
- [Release notes](https://github.com/containers/storage/releases)
- [Changelog](https://github.com/containers/storage/blob/master/docs/containers-storage-changes.md)
- [Commits](https://github.com/containers/storage/compare/v1.23.0...v1.23.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-08-19 08:59:20 -04:00
Patrick Talbert a8f80c4107 containers.conf: Fix ulimits nofile example syntax
Uncommenting the nofile example will result in a syntax error as there are extra
quote (") characters. Remove them.

Fixes: b406a112 ("Add new fields to containers.conf")
Signed-off-by: Patrick Talbert <ptalbert@redhat.com>
2020-08-19 14:16:08 +02:00
OpenShift Merge Robot d3be6cac65 Merge pull request #259 from openSUSE/go-1.15
Bump golang to 1.15
2020-08-19 12:16:23 +02:00
Sascha Grunert fa66b56024 Add mock'able unit tests and move package to `internal`
This adds internal strucutres and fakes to be able to mock the former
`isSupproted` function.

Signed-off-by: Sascha Grunert <sgrunert@suse.com>
2020-08-19 10:19:01 +02:00
Sascha Grunert 29747623fd Validate that apparmor_parser is available on the system
If AppArmor is enabled, then we now check if the `apparmor_parser`
binary is either in `/sbin` or in `$PATH`.

Signed-off-by: Sascha Grunert <sgrunert@suse.com>
2020-08-19 09:29:13 +02:00
Daniel J Walsh 87c67dcdbb Merge pull request #268 from rhatdan/TERM
Bump to v0.20.3
2020-08-18 14:22:00 -04:00
Daniel J Walsh 8dcb59ff22 Move to v0.20.3
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-08-18 14:20:51 -04:00
Daniel J Walsh 55c3126dee Bump to v0.20.3
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-08-18 14:20:51 -04:00
OpenShift Merge Robot 3e448e9971 Merge pull request #267 from rhatdan/TERM
Add TERM=xterm to default setting for env
2020-08-18 19:05:30 +02:00
Daniel J Walsh 1ef1790040 Add TERM=xterm to default setting for env
We want to make sure that the TERM envionment variable is always
set.  TERM defaulted to ansi might be better, but we want to match
Docker defaults, so we will stick at xterm.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-08-18 11:37:15 -04:00
Daniel J Walsh 02416b4c02 Merge pull request #266 from rhatdan/VERSION
Bump to v0.20.2
2020-08-17 15:33:55 -04:00
Daniel J Walsh bda22092f9 Move to v0.20.3-dev
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-08-17 15:32:31 -04:00
Daniel J Walsh 96864bd29d Bump to v0.20.2
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-08-17 15:32:17 -04:00
Tom Sweeney 7e864bce47 Merge pull request #265 from rhatdan/VERSION
Fix CONTAINER_STORAGE_CONF->CONTAINERS_STORAGE_CONF
2020-08-17 15:31:01 -04:00
Daniel J Walsh 20e45b9542 Fix CONTAINER_STORAGE_CONF->CONTAINERS_STORAGE_CONF
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-08-17 15:06:30 -04:00
Daniel J Walsh c45af45303 Merge pull request #264 from rhatdan/VERSION
Bump to v0.20.1
2020-08-17 14:40:00 -04:00
Daniel J Walsh a59fd23db5 Move to v0.20.2-dev
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-08-17 14:39:02 -04:00
Daniel J Walsh 27ffbdc482 Bump to v0.20.1
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-08-17 14:38:30 -04:00
Daniel J Walsh db2a82acdd Merge pull request #262 from rhatdan/test
Add CONTAINERS_STORAGE_CONF Environment hanlding for testing
2020-08-17 14:37:43 -04:00
Daniel J Walsh 964d22fabd Add CONTAINERS_STORAGE_CONF Environment hanlding for testing
Currently it is difficult to modify the path to the storage.conf
file for setting up testing. It is hard coded to use /etc/containers/storage.conf.

Adding this envionment variable, will allow us to write tests on storage.conf
that do not override the system defaults.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-08-17 14:27:04 -04:00
Daniel J Walsh edf3325f24 Merge pull request #261 from rhatdan/VERSION
Bump to v0.20.0
2020-08-17 09:12:28 -04:00
Daniel J Walsh 415ccc1f26 Move to v0.20.1-dev
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-08-17 09:11:26 -04:00
Daniel J Walsh 16b759ab7e Bump to v0.20.0
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-08-17 09:11:05 -04:00
OpenShift Merge Robot ad9e5e7fda Merge pull request #209 from vrothberg/multi-image-archive
multi_image_archive: add option for `podman save`
2020-08-17 14:57:42 +02:00
Valentin Rothberg f217b00ded multi_image_archive: add option for `podman save`
Add an option to control the default behavior of `podman save` or other
container engines.  If set to "true", the engine will create a
multi-image (docker) archive.  By default, Podman will interpret
additional arguments as tags that'll be stored in the archive's
manifest.  Docker interprets additional arguments as images to allow for
creating multi-image archives.  This option allows users to chose how
they wish the default behavior to look like, so we don't break
compatibility with existing Podman workloads while being compatible
with Docker.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2020-08-17 14:44:43 +02:00
OpenShift Merge Robot 099ab0af6f Merge pull request #255 from rhatdan/libpod
Do not mention libpod.conf if no files found
2020-08-17 14:35:41 +02:00
OpenShift Merge Robot 83552983ee Merge pull request #260 from openSUSE/apparmor-errors
Wrap AppArmor errors to provide more debug information
2020-08-17 14:27:44 +02:00
Sascha Grunert 73aa297b0c Wrap AppArmor errors to provide more debug information
Mostly all AppArmor errors are now wrapped to provide additional context
to the user what actually went wrong. We now only use the spelling
`AppArmor` rather than `apparmor` to give the errors a uniform look.

Signed-off-by: Sascha Grunert <sgrunert@suse.com>
2020-08-17 12:20:25 +02:00
OpenShift Merge Robot e4c07e8a56 Merge pull request #258 from openSUSE/apparmor-parser-stderr
Omit apparmor_parser warnings when parsing the version
2020-08-17 12:10:59 +02:00
Sascha Grunert ec7849ffe4 Bump golang to 1.15
Signed-off-by: Sascha Grunert <sgrunert@suse.com>
2020-08-17 12:10:39 +02:00
OpenShift Merge Robot 62c005ac7e Merge pull request #257 from openSUSE/zoneinfo
Support different zoneinfo locations
2020-08-17 12:08:13 +02:00