[PATCH 1/4] automation: standardize containerize env names

* [PATCH 1/4] automation: standardize containerize env names
       [not found] <cover.1acf9637303405d6bdb1a9ad450b2a4ea5a0307d.1532797834.git-series.cardoe@cardoe.com>
@ 2018-07-28 17:11 ` Doug Goldstein
  2018-07-30 14:38   ` Wei Liu
  2018-07-28 17:11 ` [PATCH 2/4] automation: drop container name from containerize Doug Goldstein
                   ` (2 subsequent siblings)
  3 siblings, 1 reply; 8+ messages in thread
From: Doug Goldstein @ 2018-07-28 17:11 UTC (permalink / raw)
  To: xen-devel; +Cc: Doug Goldstein, Wei Liu

Standardized all the environment variable names that the containerize
script uses to start with CONTAINER_

Signed-off-by: Doug Goldstein <cardoe@cardoe.com>
---
 automation/build/README.md      | 10 +++++-----
 automation/scripts/containerize | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/automation/build/README.md b/automation/build/README.md
index be4526c..987533a 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 7253617..010ed39 100755
--- a/automation/scripts/containerize
+++ b/automation/scripts/containerize
@@ -71,10 +71,10 @@ 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}"
+if [[ -n ${CONTAINER_PATH} ]]; then
+    :
 else
-    WORKDIR=$(git rev-parse --show-toplevel)
+    CONTAINER_PATH=$(git rev-parse --show-toplevel)
 fi
 
 # Kick off Docker
@@ -82,11 +82,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}
-- 
git-series 0.9.1

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

^ permalink raw reply related	[flat|nested] 8+ messages in thread