opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-05-21 17:16:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Run make codespell

Browse Source 
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
Daniel J Walsh
2023-03-21 14:46:14 -04:00
parent 3820554aa9
commit 5f274e45f2
7 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -278,7 +278,7 @@ test/version/version: version/version.go
.PHONY: codespell .PHONY: codespell
codespell: codespell:
codespell -S bin,vendor,.git,go.sum,.cirrus.yml,"RELEASE_NOTES.md,*.xz,*.gz,*.ps1,*.tar,swagger.yaml,*.tgz,bin2img,*ico,*.png,*.1,*.5,copyimg,*.orig,apidoc.go" -L hastable,te,clos,ans,pullrequest,uint,iff,od,seeked,splitted,marge,erro,hist,ether,specif -w codespell -S bin,vendor,.git,go.sum,.cirrus.yml,"RELEASE_NOTES.md,*.xz,*.gz,*.ps1,*.tar,swagger.yaml,*.tgz,bin2img,*ico,*.png,*.1,*.5,copyimg,*.orig,apidoc.go" -L passt,bu,hastable,te,clos,ans,pullrequest,uint,iff,od,seeked,splitted,marge,erro,hist,ether,specif -w
.PHONY: validate .PHONY: validate
validate: lint .gitvalidation validate.completions man-page-check swagger-check tests-included tests-expect-exit pr-removes-fixed-skips validate: lint .gitvalidation validate.completions man-page-check swagger-check tests-included tests-expect-exit pr-removes-fixed-skips

2
cmd/podman/containers/export.go
View File

@ -79,7 +79,7 @@ func export(cmd *cobra.Command, args []string) error {
if err := parse.ValidateFileName(outputFile); err != nil { if err := parse.ValidateFileName(outputFile); err != nil {
return err return err
} }
// open file here with WRONLY since on MacOS it can fail to open /dev/stderr in read mode for example // open file here with O_WRONLY since on MacOS it can fail to open /dev/stderr in read mode for example
// https://github.com/containers/podman/issues/16870 // https://github.com/containers/podman/issues/16870
file, err := os.OpenFile(outputFile, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0644) file, err := os.OpenFile(outputFile, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0644)
if err != nil { if err != nil {

2
libpod/runtime_img.go
View File

@ -81,7 +81,7 @@ func (r *Runtime) IsExternalContainerCallback(_ context.Context) libimage.IsExte
// NOTE: pruning external containers is subject to race conditions // NOTE: pruning external containers is subject to race conditions
// (e.g., when a container gets removed). To address this and similar // (e.g., when a container gets removed). To address this and similar
// races, pruning had to happen inside c/storage. Containers has to be // races, pruning had to happen inside c/storage. Containers has to be
// labelled with "podman/libpod" along with callbacks similar to // labeled with "podman/libpod" along with callbacks similar to
// libimage. // libimage.
return func(idOrName string) (bool, error) { return func(idOrName string) (bool, error) {
_, err := r.LookupContainer(idOrName) _, err := r.LookupContainer(idOrName)

2
test/e2e/run_networking_test.go
View File

@ -144,7 +144,7 @@ var _ = Describe("Podman run networking", func() {
// already expected to be present and processed by // already expected to be present and processed by
// Podman's DNS resolver i.e ( aarvark-dns or dnsname ). // Podman's DNS resolver i.e ( aarvark-dns or dnsname ).
Expect(session.OutputToString()).ToNot(ContainSubstring("nameserver 1.1.1.1")) Expect(session.OutputToString()).ToNot(ContainSubstring("nameserver 1.1.1.1"))
// But /etc/resolve.conf must contain othe nameserver // But /etc/resolve.conf must contain other nameserver
// i.e dns server configured for network. // i.e dns server configured for network.
Expect(session.OutputToString()).To(ContainSubstring("nameserver")) Expect(session.OutputToString()).To(ContainSubstring("nameserver"))

2
test/e2e/systemd_activate_test.go
View File

@ -72,7 +72,7 @@ var _ = Describe("Systemd activate", func() {
defer os.RemoveAll(tmpRootDir) defer os.RemoveAll(tmpRootDir)
// When SELinux is enabled, a storage root directory should be // When SELinux is enabled, a storage root directory should be
// labeld with a specific value // labeled with a specific value
if selinux.GetEnabled() { if selinux.GetEnabled() {
rootDir := "/var/lib/containers" rootDir := "/var/lib/containers"
label := "container_var_lib_t" label := "container_var_lib_t"

2
test/system/030-run.bats
View File

@ -857,7 +857,7 @@ EOF
oomscore=$((oomscore+1)) oomscore=$((oomscore+1))
CONTAINERS_CONF=$PODMAN_TMPDIR/containers.conf run_podman run --oom-score-adj=$oomscore --rm $IMAGE cat /proc/self/oom_score_adj CONTAINERS_CONF=$PODMAN_TMPDIR/containers.conf run_podman run --oom-score-adj=$oomscore --rm $IMAGE cat /proc/self/oom_score_adj
is "$output" "$oomscore" "--oom-score-adj should overide containers.conf" is "$output" "$oomscore" "--oom-score-adj should override containers.conf"
} }
# CVE-2022-1227 : podman top joins container mount NS and uses nsenter from image # CVE-2022-1227 : podman top joins container mount NS and uses nsenter from image

6
test/system/150-login.bats
View File

@ -203,19 +203,19 @@ function _push_search_test() {
--creds ${PODMAN_LOGIN_USER}:${PODMAN_LOGIN_PASS} \ --creds ${PODMAN_LOGIN_USER}:${PODMAN_LOGIN_PASS} \
$IMAGE localhost:${PODMAN_LOGIN_REGISTRY_PORT}/$destname $IMAGE localhost:${PODMAN_LOGIN_REGISTRY_PORT}/$destname
# Search a pushed image without --cert-dir will be failed if --tls-verify=true # Search a pushed image without --cert-dir should fail if --tls-verify=true
run_podman $2 search --tls-verify=$1 \ run_podman $2 search --tls-verify=$1 \
--format "table {{.Name}}" \ --format "table {{.Name}}" \
--creds ${PODMAN_LOGIN_USER}:${PODMAN_LOGIN_PASS} \ --creds ${PODMAN_LOGIN_USER}:${PODMAN_LOGIN_PASS} \
localhost:${PODMAN_LOGIN_REGISTRY_PORT}/$destname localhost:${PODMAN_LOGIN_REGISTRY_PORT}/$destname
# Search a pushed image without --creds will be failed # Search a pushed image without --creds should fail
run_podman 125 search --tls-verify=$1 \ run_podman 125 search --tls-verify=$1 \
--format "table {{.Name}}" \ --format "table {{.Name}}" \
--cert-dir ${PODMAN_LOGIN_WORKDIR}/trusted-registry-cert-dir \ --cert-dir ${PODMAN_LOGIN_WORKDIR}/trusted-registry-cert-dir \
localhost:${PODMAN_LOGIN_REGISTRY_PORT}/$destname localhost:${PODMAN_LOGIN_REGISTRY_PORT}/$destname
# Search a pushed image will be successed # Search a pushed image should succeed
run_podman search --tls-verify=$1 \ run_podman search --tls-verify=$1 \
--format "table {{.Name}}" \ --format "table {{.Name}}" \
--cert-dir ${PODMAN_LOGIN_WORKDIR}/trusted-registry-cert-dir \ --cert-dir ${PODMAN_LOGIN_WORKDIR}/trusted-registry-cert-dir \