Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: containers.conf: fix the size of indentations #556

Closed
wants to merge 1 commit into from
Closed

fix: containers.conf: fix the size of indentations #556

wants to merge 1 commit into from

Conversation

unknowndevQwQ
Copy link
Contributor

Some details:
No spaces between configurable items and comments, line feed indentation are two spaces

Signed-off-by: unknowndev233@github unknowndevQwQ@protonmail.com

Some details:
No spaces between configurable items and comments, line feed indentation are two spaces

Signed-off-by: unknowndev233@github <unknowndevQwQ@protonmail.com>
@unknowndevQwQ
Copy link
Contributor Author

/assign @giuseppe

@rhatdan
Copy link
Member

rhatdan commented May 15, 2021

I am fine with this change, but is this following some standard?

@unknowndevQwQ
Copy link
Contributor Author

I am fine with this change, but is this following some standard?

Hmm,e.g. toml standard?

@rhatdan
Copy link
Member

rhatdan commented May 16, 2021

Yes, why do you think this spacing of the containers.conf file is better then what was there before?

@vrothberg
Copy link
Member

vrothberg commented May 16, 2021 via email

@unknowndevQwQ
Copy link
Contributor Author

Yes, why do you think this spacing of the containers.conf file is better then what was there before?

Most of the adjustments are derived from the examples at https://toml.io/en/latest, There is no space before the option to make it clearer that it is an option

There should be a line break between the description and the option(TODO)

@rhatdan
Copy link
Member

rhatdan commented May 29, 2021

/approve
LGTM

@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 29, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: rhatdan, unknowndev233

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@TomSweeneyRedHat
Copy link
Member

@giuseppe needs a rebase

rhatdan added a commit to rhatdan/common that referenced this pull request Jun 10, 2021
Replaces:  containers#556

Signed-off-by: unknowndev233@github unknowndevQwQ@protonmail.com
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
rhatdan added a commit to rhatdan/common that referenced this pull request Jun 10, 2021
Replaces:  containers#556

Signed-off-by: unknowndev233@github unknowndevQwQ@protonmail.com
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
@rhatdan rhatdan closed this Jun 10, 2021
@unknowndevQwQ unknowndevQwQ deleted the patch-1 branch June 30, 2021 11:32
trusch pushed a commit to trusch/common that referenced this pull request Jun 30, 2021
libmage: Exists: catch corrupted images

While various execution paths in libimage already handle corrupted
images, `(*Runtime).Exists()` did not and would list an image to exist
in the storage even if it is corrupted.

Some corruptions can only be detected when accessing the individual
data.  A reliable way of accessing such data is to inspect an image.
Hence, an image will only be listed to exist if a) it has been found
and b) can be inspected.  If the inspection fails, the image will be
reported to not exists but without an error.  That allows for users
of libimage to properly recover and repull.

Further, add a new unit tests that forces a data corruption and
gradually recovers from it.

Podman will now behave as follows:
```
$ ./bin/podman run -d --rm nginx ls
ERRO[0000] Image nginx exists in local storage but may be corrupted: layer not known
ERRO[0000] Looking up nginx in local storage: layer not known
Resolved "nginx" as an alias (/home/vrothberg/.cache/containers/short-name-aliases.conf)
Trying to pull docker.io/library/nginx:latest...
Getting image source signatures
Copying blob 596b1d696923 skipped: already exists
Copying blob 30afc0b18f67 skipped: already exists
Copying blob febe5bd23e98 skipped: already exists
Copying blob 69692152171a skipped: already exists
Copying blob 8283eee92e2f skipped: already exists
Copying blob 351ad75a6cfa done
Copying config d1a364dc54 done
Writing manifest to image destination
Storing signatures
56b65883c3c32b67277bcc173bd9f26c27cbbdbc6d3aacf6c552be796eb7a337
```

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>

Add default for log-tag

Needed for containers/podman#10204

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

build(deps): bump github.com/containers/storage from 1.32.1 to 1.32.2

Bumps [github.com/containers/storage](https://github.com/containers/storage) from 1.32.1 to 1.32.2.
- [Release notes](https://github.com/containers/storage/releases)
- [Changelog](https://github.com/containers/storage/blob/master/docs/containers-storage-changes.md)
- [Commits](containers/storage@v1.32.1...v1.32.2)

---
updated-dependencies:
- dependency-name: github.com/containers/storage
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

fix autodiscovery of the secret passdriver.

add 'secret' section to the containers.conf struct.

libimage: fix Exists

Commit 964b002 introduced a regression to Exists() which would
return an error if the image does not exist.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>

Sort containers.conf and containers.conf.5.md

Remove cgroup_check which is no longer needed.

Fixes: containers#372

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

Add support for config drop in directories

Fixes: containers#368

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

Fix spacing on name value pairs to be consistent

Replaces:  containers#556

Signed-off-by: unknowndev233@github unknowndevQwQ@protonmail.com
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

seccomp: allow timer_settime64

allow time64 variant of timer_settime which was missed in 4e31f66

Signed-off-by: Jan Palus <jpalus@fastmail.com>

seccomp: add support for defaultErrnoRet

Add support to specify the default errno return value.

The OCI runtime specs already have support for it, and both crun (>=
0.19) and runc (>= 1.0-rc95) have support for it.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>

seccomp: switch default to ENOSYS

add the currently blocked syscalls to a deny-list and switch the
default to ENOSYS.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>

build(deps): bump github.com/containers/image/v5 from 5.12.0 to 5.13.0

Bumps [github.com/containers/image/v5](https://github.com/containers/image) from 5.12.0 to 5.13.0.
- [Release notes](https://github.com/containers/image/releases)
- [Commits](containers/image@v5.12.0...v5.13.0)

---
updated-dependencies:
- dependency-name: github.com/containers/image/v5
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Strip extra trailing newlines in templates

When wrapping table format in range, string extra new lines from table
ends.

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1855983

Signed-off-by: Jhon Honce <jhonce@redhat.com>

Use SetCredentials and add verbose to loginopts

Signed-off-by: flouthoc <flouthoc.git@gmail.com>

Bump to v0.40.0

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

Move to v0.40.1-dev

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

Set BigFilesTemporaryDir to GetEnv(TMPDIR) if set or /var/tmp

Currently if the caller does not specify the BigFilesTemporaryDir,
Podman and Buildah users expect this to default TMPDIR environment
variable or /var/tmp if not set.

Moving to libimage caused a regression in this functionality.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

build(deps): bump github.com/containers/image/v5 from 5.13.0 to 5.13.1

Bumps [github.com/containers/image/v5](https://github.com/containers/image) from 5.13.0 to 5.13.1.
- [Release notes](https://github.com/containers/image/releases)
- [Commits](containers/image@v5.13.0...v5.13.1)

---
updated-dependencies:
- dependency-name: github.com/containers/image/v5
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

libimage: force remove: only untag on multi tag image

When removing an image by name, do not remove the image and all its
tags, even if force is set.  Instead, just untag the specified name.

Note: adjust the load test to preserve the order in the untagged field.

Also vendor in the latest HEAD in containers/image to fix a bug revealed
in Podman CI.

Context: containers/podman/issues/10685
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>

libimage: lookup images by custom platform

Allow for looking up images via customizable arch, os and variant.
This prevents `podman run --arch=xxx` from redundantly pulling down the
image if needed.

Context: containers/podman/issues/10648
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>

seccomp: allow clone3

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>

seccomp: let io_uring_* fail with ENOSYS

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>

seccomp: allow pkey_*

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>

seccomp: allow rseq

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>

seccomp: let membarrier fail with ENOSYS

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>

seccomp: always allow get_mempolicy, set_mempolicy, mbind

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>

Vendor in containers/image v5.13.2

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

Vendor in containers/image v5.13.2

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

Bump to v0.40.1

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

Move to v0.40.2-dev

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

feat: add external secret driver.

use /bin/sh instead of /bin/bash

fix test by removing accidentially added driver setup.

rename externaldriver to shelldriver

Signed-off-by: Tino Rusch <tino.rusch@gmail.com>

remove commented test setup

Signed-off-by: Tino Rusch <tino.rusch@gmail.com>
openshift-ci bot added a commit that referenced this pull request Aug 1, 2021
openshift-ci bot added a commit that referenced this pull request Aug 3, 2021
style: complete #556 to-do list part 4
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants