Merge 282e470e72 into 1ef3f55c95

Docs/build_docker_unreal.md

@@ -66,10 +66,10 @@ The following command will use the image created in the previous step to build t
 docker build -t carla -f Carla.Dockerfile .
 ```
 
-If you would like to build a specific branch or tag of the CARLA repository, run the following command:
+If you would like to build a specific CARLA repository (defaulted to https://github.com/carla-simulator/carla.git), a branch or tag (defaulted to master), run the following command:
 
 ```sh
-docker build -t carla -f Carla.Dockerfile . --build-arg GIT_BRANCH=<branch_or_tag_name>
+docker build -t carla -f Carla.Dockerfile . --build-arg GIT_BRANCH=<branch_or_tag_name> --build-arg GIT_REPO=<repo_url> 
 ```
 
 ---

Util/Docker/Carla.Dockerfile

@@ -1,13 +1,13 @@
 FROM carla-prerequisites:latest
 
-ARG GIT_BRANCH
+ARG GIT_BRANCH=master
+ARG GIT_REPO=https://github.com/carla-simulator/carla.git
 
 USER carla
 WORKDIR /home/carla
 
-RUN cd /home/carla/ && \
-  if [ -z ${GIT_BRANCH+x} ]; then git clone --depth 1 https://github.com/carla-simulator/carla.git; \
-  else git clone --depth 1 --branch $GIT_BRANCH https://github.com/carla-simulator/carla.git; fi && \
+RUN cd /home/carla && \
+  git clone --depth 1 --branch $GIT_BRANCH "$GIT_REPO" && \
   cd /home/carla/carla && \
   ./Update.sh && \
   make CarlaUE4Editor && \

Util/Docker/README.md

@@ -72,10 +72,10 @@ docker build -t carla -f Carla.Dockerfile .
 
 ## Other useful information
 
-You can use a specific repository **branch** or **tag** from our repository, using:
+You can use a specific **repository** and a  **branch** or **tag** from our repository, using:
 
 ```
-docker build -t carla -f Carla.Dockerfile . --build-arg GIT_BRANCH=branch_name
+docker build -t carla -f Carla.Dockerfile . --build-arg GIT_BRANCH=branch_name --build-arg GIT_REPO=https://github.com/carla-simulator/carla.git
 ```
 
 Clean up the intermediate images from the build (keep the ue4-source image so you can use it for full rebuilds)