[xen staging] automation: standardize containerize env names

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[xen staging] automation: standardize containerize env names

patchbot
commit 7d217430d6ef32be9588dbd26e22006efc8bcded
Author:     Doug Goldstein <[hidden email]>
AuthorDate: Fri Aug 3 09:46:46 2018 -0500
Commit:     Wei Liu <[hidden email]>
CommitDate: Fri Aug 3 16:11:18 2018 +0100

    automation: standardize containerize env names
   
    Standardized all the environment variable names that the containerize
    script uses to start with CONTAINER_
   
    Signed-off-by: Doug Goldstein <[hidden email]>
    Reviewed-by: Wei Liu <[hidden email]>
---
 automation/build/README.md      | 10 +++++-----
 automation/scripts/containerize | 10 ++++------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/automation/build/README.md b/automation/build/README.md
index be4526c768..987533ac14 100644
--- a/automation/build/README.md
+++ b/automation/build/README.md
@@ -40,13 +40,16 @@ understands.
   CONTAINER=centos72 ./automation/scripts/containerize make
   ```
 
-- WORKDIR: This overrides the path that will be available under the
+- CONTAINER_PATH: This overrides the path that will be available under the
   `/build` directory in the container, which is the default path.
 
   ```
-  WORKDIR=/some/other/path ./automation/scripts/containerize ls
+  CONTAINER_PATH=/some/other/path ./automation/scripts/containerize ls
   ```
 
+- CONTAINER_ARGS: Allows you to pass extra arguments to Docker
+  when starting the container.
+
 - XEN_CONFIG_EXPERT: If this is defined in your shell it will be
   automatically passed through to the container.
 
@@ -56,9 +59,6 @@ understands.
   of the same version. Override the name value to cause it to name
   the container differently on start.
 
-- EXTRA_CONTAINER_ARGS: Allows you to pass extra arguments to Docker
-  when starting the container.
-
 Building a container
 --------------------
 
diff --git a/automation/scripts/containerize b/automation/scripts/containerize
index f7f66428d9..f4ff24c25a 100755
--- a/automation/scripts/containerize
+++ b/automation/scripts/containerize
@@ -72,10 +72,8 @@ fi
 
 # Figure out the base of what we want as our sources
 # by using the top of the git repo
-if [[ -n ${WORKDIR} ]]; then
-    WORKDIR="${WORKDIR}"
-else
-    WORKDIR=$(git rev-parse --show-toplevel)
+if [[ -z ${CONTAINER_PATH} ]]; then
+    CONTAINER_PATH=$(git rev-parse --show-toplevel)
 fi
 
 # Kick off Docker
@@ -83,11 +81,11 @@ einfo "*** Launching container ..."
 exec docker run \
     ${DOCKER_ARGS} \
     ${SSH_AUTH_SOCK:+-e SSH_AUTH_SOCK="/tmp/ssh-agent/${SSH_AUTH_NAME}"} \
-    -v "${WORKDIR}":/build:rw \
+    -v "${CONTAINER_PATH}":/build:rw \
     -v "${HOME}/.ssh":/root/.ssh:ro \
     ${SSH_AUTH_DIR:+-v "${SSH_AUTH_DIR}":/tmp/ssh-agent} \
     ${XEN_CONFIG_EXPERT:+-e XEN_CONFIG_EXPERT=${XEN_CONFIG_EXPERT}} \
-    ${EXTRA_CONTAINER_ARGS} ${name} \
+    ${CONTAINER_ARGS} ${name} \
     -${termint}i --rm -- \
     ${CONTAINER} \
     ${cmd}
--
generated by git-patchbot for /home/xen/git/xen.git#staging

_______________________________________________
Xen-changelog mailing list
[hidden email]
https://lists.xenproject.org/xen-changelog