summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJosh Soref <jsoref@users.noreply.github.com>2020-12-21 17:48:43 -0500
committerJosh Soref <jsoref@users.noreply.github.com>2020-12-22 13:34:31 -0500
commit4fa1fce930f13d71f39b65bad3f46f61d961ab51 (patch)
tree3651ceec491317b6ab3aab81c7ab136eb0ff3c02 /contrib
parent07663f74c48d11732a3330248f837d5abf86fe9c (diff)
downloadpodman-4fa1fce930f13d71f39b65bad3f46f61d961ab51.tar.gz
podman-4fa1fce930f13d71f39b65bad3f46f61d961ab51.tar.bz2
podman-4fa1fce930f13d71f39b65bad3f46f61d961ab51.zip
Spelling
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/cirrus/ext_svc_check.sh2
-rw-r--r--contrib/cirrus/lib.sh4
-rwxr-xr-xcontrib/cirrus/logformatter2
-rw-r--r--contrib/podmanimage/stable/manual/Containerfile2
-rw-r--r--contrib/remote/containers.conf2
-rw-r--r--contrib/rootless-cni-infra/Containerfile2
6 files changed, 7 insertions, 7 deletions
diff --git a/contrib/cirrus/ext_svc_check.sh b/contrib/cirrus/ext_svc_check.sh
index b89e3d753..92ac4e93a 100755
--- a/contrib/cirrus/ext_svc_check.sh
+++ b/contrib/cirrus/ext_svc_check.sh
@@ -6,7 +6,7 @@ set -eo pipefail
# by connecting to a set of essential external servers and failing
# if any cannot be reached. It's intended for use early on in the
# podman CI system, to help prevent wasting time on tests that can't
-# succeede due to some outage or another.
+# succeed due to some outage or another.
# shellcheck source=./contrib/cirrus/lib.sh
source $(dirname $0)/lib.sh
diff --git a/contrib/cirrus/lib.sh b/contrib/cirrus/lib.sh
index ea47c554a..bc9a95310 100644
--- a/contrib/cirrus/lib.sh
+++ b/contrib/cirrus/lib.sh
@@ -42,7 +42,7 @@ fi
OS_RELEASE_ID="$(source /etc/os-release; echo $ID)"
# GCE image-name compatible string representation of distribution _major_ version
OS_RELEASE_VER="$(source /etc/os-release; echo $VERSION_ID | tr -d '.')"
-# Combined to ease soe usage
+# Combined to ease some usage
OS_REL_VER="${OS_RELEASE_ID}-${OS_RELEASE_VER}"
# This is normally set from .cirrus.yml but default is necessary when
# running under hack/get_ci_vm.sh since it cannot infer the value.
@@ -87,7 +87,7 @@ CIRRUS_BUILD_ID=${CIRRUS_BUILD_ID:-$RANDOM$(date +%s)} # must be short and uniq
# The starting place for linting and code validation
EPOCH_TEST_COMMIT="$CIRRUS_BASE_SHA"
-# Regex defining all CI-releated env. vars. necessary for all possible
+# Regex defining all CI-related env. vars. necessary for all possible
# testing operations on all platforms and versions. This is necessary
# to avoid needlessly passing through global/system values across
# contexts, such as host->container or root->rootless user
diff --git a/contrib/cirrus/logformatter b/contrib/cirrus/logformatter
index bcafbc473..3fa0e5618 100755
--- a/contrib/cirrus/logformatter
+++ b/contrib/cirrus/logformatter
@@ -506,7 +506,7 @@ END_SYNOPSIS
# PR 1234 - title of the pr
my $pr_title = escapeHTML(_env_replace("{CIRRUS_CHANGE_TITLE}"));
- $s .= _tr("Github PR", sprintf("%s - %s",
+ $s .= _tr("GitHub PR", sprintf("%s - %s",
_a("{CIRRUS_PR}", "https://{CIRRUS_REPO_CLONE_HOST}/{CIRRUS_REPO_FULL_NAME}/pull/{CIRRUS_PR}"),
$pr_title));
diff --git a/contrib/podmanimage/stable/manual/Containerfile b/contrib/podmanimage/stable/manual/Containerfile
index f9ae57dbf..fb4d1adc0 100644
--- a/contrib/podmanimage/stable/manual/Containerfile
+++ b/contrib/podmanimage/stable/manual/Containerfile
@@ -9,7 +9,7 @@
# the RPM name would need to be adjusted before a run as
# appropriate.
#
-# To use, first copy an rpm file from bohdi to `/root/tmp`
+# To use, first copy an rpm file from bodhi to `/root/tmp`
# and then run:
# 'podman build -f ./Containerfile -t quay.io/podman/stable:v1.7.0 .'
#
diff --git a/contrib/remote/containers.conf b/contrib/remote/containers.conf
index 45f58171a..9b0b62c42 100644
--- a/contrib/remote/containers.conf
+++ b/contrib/remote/containers.conf
@@ -7,5 +7,5 @@
# Default Remote URI to access the Podman service.
# Examples:
# remote rootless ssh://engineering.lab.company.com/run/user/1000/podman/podman.sock
-# remote rootfull ssh://root@10.10.1.136:22/run/podman/podman.sock
+# remote rootful ssh://root@10.10.1.136:22/run/podman/podman.sock
# remote_uri= ""
diff --git a/contrib/rootless-cni-infra/Containerfile b/contrib/rootless-cni-infra/Containerfile
index dd80fda28..871e06a6c 100644
--- a/contrib/rootless-cni-infra/Containerfile
+++ b/contrib/rootless-cni-infra/Containerfile
@@ -2,7 +2,7 @@ ARG GOLANG_VERSION=1.15
ARG ALPINE_VERSION=3.12
ARG CNI_VERSION=v0.8.0
ARG CNI_PLUGINS_VERSION=v0.8.7
-ARG DNSNAME_VESION=v1.0.0
+ARG DNSNAME_VERSION=v1.0.0
FROM golang:${GOLANG_VERSION}-alpine${ALPINE_VERSION} AS golang-base
RUN apk add --no-cache git