Merge "Make various spelling and usage fixes in Loci"
This commit is contained in:
commit
19072929b1
10
README.md
10
README.md
|
@ -68,7 +68,7 @@ $ docker build https://git.openstack.org/openstack/loci.git \
|
||||||
For more advanced building you can use docker build arguments to define:
|
For more advanced building you can use docker build arguments to define:
|
||||||
* `FROM` The base Docker image to build from. Currently supported are
|
* `FROM` The base Docker image to build from. Currently supported are
|
||||||
`ubuntu:xenial`, `centos:7`, `opensuse/leap:15`, or a base image
|
`ubuntu:xenial`, `centos:7`, `opensuse/leap:15`, or a base image
|
||||||
derived from one of those distributions. Dockerfiles to boostrap the
|
derived from one of those distributions. Dockerfiles to bootstrap the
|
||||||
base images can be found in the `dockerfiles` directory, and are a good
|
base images can be found in the `dockerfiles` directory, and are a good
|
||||||
starting point for customizing a base image.
|
starting point for customizing a base image.
|
||||||
* `PROJECT` The name of the project to install.
|
* `PROJECT` The name of the project to install.
|
||||||
|
@ -91,8 +91,8 @@ For more advanced building you can use docker build arguments to define:
|
||||||
The only caveat is these packages must exist in WHEELS form. So if
|
The only caveat is these packages must exist in WHEELS form. So if
|
||||||
you wanted to include rpdb, you would need to have built that into your
|
you wanted to include rpdb, you would need to have built that into your
|
||||||
WHEELS.
|
WHEELS.
|
||||||
* `PIP_ARGS` Specify additional pip's parameters you would like.
|
* `PIP_ARGS` Specify additional pip parameters you would like.
|
||||||
* `PIP_WHEEL_ARGS` Specify additional pip's wheel parameters you would like.
|
* `PIP_WHEEL_ARGS` Specify additional pip wheel parameters you would like.
|
||||||
Default is PIP_ARGS.
|
Default is PIP_ARGS.
|
||||||
* `DIST_PACKAGES` Specify additional distribution packages you would like
|
* `DIST_PACKAGES` Specify additional distribution packages you would like
|
||||||
installed.
|
installed.
|
||||||
|
@ -111,7 +111,7 @@ $ docker build https://git.openstack.org/openstack/loci.git \
|
||||||
--build-arg PROJECT_REF=refs/changes/67/418167/1
|
--build-arg PROJECT_REF=refs/changes/67/418167/1
|
||||||
```
|
```
|
||||||
|
|
||||||
To build with the wheels from a private Docker registry rather than DockerHub run:
|
To build with the wheels from a private Docker registry rather than Docker Hub run:
|
||||||
``` bash
|
``` bash
|
||||||
$ docker build https://git.openstack.org/openstack/loci.git \
|
$ docker build https://git.openstack.org/openstack/loci.git \
|
||||||
--build-arg PROJECT=keystone \
|
--build-arg PROJECT=keystone \
|
||||||
|
@ -130,7 +130,7 @@ $ docker build https://git.openstack.org/openstack/loci.git \
|
||||||
The images should contain all the required assets for running the service. But
|
The images should contain all the required assets for running the service. But
|
||||||
if you wish or need to customize the `loci/keystone` image that's great! We
|
if you wish or need to customize the `loci/keystone` image that's great! We
|
||||||
hope to have built the images to make this as easy and flexible as possible. To
|
hope to have built the images to make this as easy and flexible as possible. To
|
||||||
do this we recommend that you perform any required customisation in a child
|
do this we recommend that you perform any required customization in a child
|
||||||
image using a pattern similar to:
|
image using a pattern similar to:
|
||||||
|
|
||||||
``` Dockerfile
|
``` Dockerfile
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
tasks:
|
tasks:
|
||||||
- include_vars: vars.yaml
|
- include_vars: vars.yaml
|
||||||
|
|
||||||
- name: Push project to DockerHub
|
- name: Push project to Docker Hub
|
||||||
block:
|
block:
|
||||||
- command: docker login -u {{ loci_docker_login.user }} -p {{ loci_docker_login.password }}
|
- command: docker login -u {{ loci_docker_login.user }} -p {{ loci_docker_login.password }}
|
||||||
no_log: True
|
no_log: True
|
||||||
|
|
|
@ -10,11 +10,11 @@ docker_daemon:
|
||||||
# Setting reuse_requirements to True will use the most recent
|
# Setting reuse_requirements to True will use the most recent
|
||||||
# requirements build from the gate registry. This can save bandwidth
|
# requirements build from the gate registry. This can save bandwidth
|
||||||
# and time. However, it introduces a gate race condition if a change
|
# and time. However, it introduces a gate race condition if a change
|
||||||
# is posted that updates requirments. We set to false to prefer
|
# is posted that updates requirements. We set to false to prefer
|
||||||
# correctness to speed.
|
# correctness to speed.
|
||||||
reuse_requirements: False
|
reuse_requirements: False
|
||||||
|
|
||||||
# Override Zuul inferrence of source directory from project name to always
|
# Override Zuul inference of source directory from project name to always
|
||||||
# use "loci".
|
# use "loci".
|
||||||
loci_src_dir: "src/git.openstack.org/openstack/loci"
|
loci_src_dir: "src/git.openstack.org/openstack/loci"
|
||||||
# Branch name used for image building and publishing
|
# Branch name used for image building and publishing
|
||||||
|
|
|
@ -77,12 +77,12 @@ def get_wheels(url):
|
||||||
return resp.read()
|
return resp.read()
|
||||||
|
|
||||||
def parse_image(full_image):
|
def parse_image(full_image):
|
||||||
slash_occurences = len(re.findall('/',full_image))
|
slash_occurrences = len(re.findall('/',full_image))
|
||||||
repo = None
|
repo = None
|
||||||
registry = DOCKER_REGISTRY
|
registry = DOCKER_REGISTRY
|
||||||
if slash_occurences == 2:
|
if slash_occurrences == 2:
|
||||||
registry, repo, image = full_image.split('/')
|
registry, repo, image = full_image.split('/')
|
||||||
elif slash_occurences == 1:
|
elif slash_occurrences == 1:
|
||||||
repo, image = full_image.split('/')
|
repo, image = full_image.split('/')
|
||||||
else:
|
else:
|
||||||
image = full_image
|
image = full_image
|
||||||
|
|
Loading…
Reference in New Issue