Browse Source

Make various spelling and usage fixes in Loci

This patch is an audit of the Loci documents and code for trivial
spelling and usage errors.

Change-Id: I64ee9d4eb5b299852c53ee9c6ab8e7d9b862ac73
Chris Hoge 2 months ago
parent
commit
3f3a672d25
4 changed files with 11 additions and 11 deletions
  1. 5
    5
      README.md
  2. 1
    1
      playbooks/push.yaml
  3. 2
    2
      playbooks/vars.yaml
  4. 3
    3
      scripts/fetch_wheels.py

+ 5
- 5
README.md View File

@@ -68,7 +68,7 @@ $ docker build https://git.openstack.org/openstack/loci.git \
68 68
 For more advanced building you can use docker build arguments to define:
69 69
   * `FROM` The base Docker image to build from. Currently supported are
70 70
     `ubuntu:xenial`, `centos:7`, `opensuse/leap:15`, or a base image
71
-    derived from one of those distributions. Dockerfiles to boostrap the
71
+    derived from one of those distributions. Dockerfiles to bootstrap the
72 72
     base images can be found in the `dockerfiles` directory, and are a good
73 73
     starting point for customizing a base image.
74 74
   * `PROJECT` The name of the project to install.
@@ -91,8 +91,8 @@ For more advanced building you can use docker build arguments to define:
91 91
     The only caveat is these packages must exist in WHEELS form. So if
92 92
     you wanted to include rpdb, you would need to have built that into your
93 93
     WHEELS.
94
-  * `PIP_ARGS` Specify additional pip's parameters you would like.
95
-  * `PIP_WHEEL_ARGS` Specify additional pip's wheel parameters you would like.
94
+  * `PIP_ARGS` Specify additional pip parameters you would like.
95
+  * `PIP_WHEEL_ARGS` Specify additional pip wheel parameters you would like.
96 96
      Default is PIP_ARGS.
97 97
   * `DIST_PACKAGES` Specify additional distribution packages you would like
98 98
     installed.
@@ -111,7 +111,7 @@ $ docker build https://git.openstack.org/openstack/loci.git \
111 111
     --build-arg PROJECT_REF=refs/changes/67/418167/1
112 112
 ```
113 113
 
114
-To build with the wheels from a private Docker registry rather than DockerHub run:
114
+To build with the wheels from a private Docker registry rather than Docker Hub run:
115 115
 ``` bash
116 116
 $ docker build https://git.openstack.org/openstack/loci.git \
117 117
     --build-arg PROJECT=keystone \
@@ -130,7 +130,7 @@ $ docker build https://git.openstack.org/openstack/loci.git \
130 130
 The images should contain all the required assets for running the service. But
131 131
 if you wish or need to customize the `loci/keystone` image that's great! We
132 132
 hope to have built the images to make this as easy and flexible as possible. To
133
-do this we recommend that you perform any required customisation in a child
133
+do this we recommend that you perform any required customization in a child
134 134
 image using a pattern similar to:
135 135
 
136 136
 ``` Dockerfile

+ 1
- 1
playbooks/push.yaml View File

@@ -2,7 +2,7 @@
2 2
   tasks:
3 3
     - include_vars: vars.yaml
4 4
 
5
-    - name: Push project to DockerHub
5
+    - name: Push project to Docker Hub
6 6
       block:
7 7
         - command: docker login -u {{ loci_docker_login.user }} -p {{ loci_docker_login.password }}
8 8
           no_log: True

+ 2
- 2
playbooks/vars.yaml View File

@@ -10,11 +10,11 @@ docker_daemon:
10 10
 # Setting reuse_requirements to True will use the most recent
11 11
 # requirements build from the gate registry. This can save bandwidth
12 12
 # and time. However, it introduces a gate race condition if a change
13
-# is posted that updates requirments. We set to false to prefer
13
+# is posted that updates requirements. We set to false to prefer
14 14
 # correctness to speed.
15 15
 reuse_requirements: False
16 16
 
17
-# Override Zuul inferrence of source directory from project name to always
17
+# Override Zuul inference of source directory from project name to always
18 18
 # use "loci".
19 19
 loci_src_dir: "src/git.openstack.org/openstack/loci"
20 20
 # Branch name used for image building and publishing

+ 3
- 3
scripts/fetch_wheels.py View File

@@ -77,12 +77,12 @@ def get_wheels(url):
77 77
     return resp.read()
78 78
 
79 79
 def parse_image(full_image):
80
-    slash_occurences = len(re.findall('/',full_image))
80
+    slash_occurrences = len(re.findall('/',full_image))
81 81
     repo = None
82 82
     registry = DOCKER_REGISTRY
83
-    if slash_occurences == 2:
83
+    if slash_occurrences == 2:
84 84
         registry, repo, image = full_image.split('/')
85
-    elif slash_occurences == 1:
85
+    elif slash_occurrences == 1:
86 86
         repo, image = full_image.split('/')
87 87
     else:
88 88
         image = full_image

Loading…
Cancel
Save