Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Docker ] Add an argument for the CARLA repository #5905

Open
wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

[Docker ] Add an argument for the CARLA repository #5905

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ca889bd
:sparkles: Issue #5904 [Docker ] Add an argument for the CARLA reposi…
Nov 2, 2022
282e470
Merge branch 'dev' into feature/5904-Use-custom-carla-repository-in-d…
sebastienmascha May 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Docs/build_docker_unreal.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
```

---
Expand Down
8 changes: 4 additions & 4 deletions Util/Docker/Carla.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 && \
Expand Down
4 changes: 2 additions & 2 deletions Util/Docker/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down