[hadoop-submarine] branch master updated: SUBMARINE-239. Submarine cicd docker support Environmental variable

[li...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

liuxun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hadoop-submarine.git


The following commit(s) were added to refs/heads/master by this push:
     new be40410  SUBMARINE-239. Submarine cicd docker support Environmental variable
be40410 is described below

commit be4041014abe17650e73251eda11485144dc362e
Author: Xun Liu <li...@apache.org>
AuthorDate: Mon Oct 14 20:18:22 2019 +0800

    SUBMARINE-239. Submarine cicd docker support Environmental variable
    
    ### What is this PR for?
    1. Set the apache account and password in the local environment variable.
    2. Pass the local environment variable to the container for execution via the docker startup command.
    3. Avoid using plain text to pass passwords in the docker startup command
    
    ```
    vi ~/.bash_profile
    export JIRA_USERNAME='Your jira username'
    export JIRA_PASSWORD='Your jira password'
    export APACHE_ID='Your apache id' # Your apache email prefix
    export APACHE_NAME='Your apache name'
    ```
    
    cicd docker startup command
    
    ```
    docker run -it -e JIRA_USERNAME="${JIRA_USERNAME}" -e JIRA_PASSWORD="${JIRA_PASSWORD}" -e APACHE_ID="${APACHE_ID}" -e APACHE_NAME="${APACHE_NAME}" --rm submarine-cicd
    ```
    
    ### What type of PR is it?
    [Improvement]
    
    ### What is the Jira issue?
    * https://issues.apache.org/jira/browse/SUBMARINE-239
    
    ### How should this be tested?
    * [CI Pass](https://travis-ci.org/liuxunorg/hadoop-submarine/builds/597600824)
    
    ### Screenshots (if appropriate)
    
    ### Questions:
    * Does the licenses files need update?  No
    * Is there breaking changes for older versions?  No
    * Does this needs documentation? Yes
    
    Author: Xun Liu <li...@apache.org>
    
    Closes #47 from liuxunorg/SUBMARINE-239 and squashes the following commits:
    
    8623cec [Xun Liu] SUBMARINE-239. Submarine cicd docker support Environmental variable
---
 dev-support/cicd/README.md | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/dev-support/cicd/README.md b/dev-support/cicd/README.md
index 24880c6..969b2f6 100644
--- a/dev-support/cicd/README.md
+++ b/dev-support/cicd/README.md
@@ -33,14 +33,26 @@ docker run -it --rm submarine-cicd
 ```
 
 Jira username, password, apache id and apache username are required in the docker container. You can
-add them to the docker startup command.
+add them to the local environment variable.
+
+```
+vi ~/.bash_profile
+export JIRA_USERNAME='Your jira username'
+export JIRA_PASSWORD='Your jira password'
+export APACHE_ID='Your apache id' # Your apache email prefix
+export APACHE_NAME='Your apache name'
+```
 
 And you'll see output like below and then you can decide what to accomplish.
 ```
-$ docker run -it -e JIRA_USERNAME='jira username' -e JIRA_PASSWORD='jira password' \
- -e APACHE_ID='apache id' -e APACHE_NAME="apache name" --rm submarine-cicd 
+$ docker run -it -e JIRA_USERNAME="${JIRA_USERNAME}" -e JIRA_PASSWORD="${JIRA_PASSWORD}" -e APACHE_ID="${APACHE_ID}" -e APACHE_NAME="${APACHE_NAME}" --rm submarine-cicd
+```
+
+The screen outputs the following information: 
+
+```
 Menu:
-	1. Merge PR
+    1. Merge PR
 Enter Menu ID:1
 ==== Merge PR Begin ====
 Got JIRA name: username