Skip to content

Commit

Permalink
update Dockerfile for release processing
Browse files Browse the repository at this point in the history
  • Loading branch information
cgeller committed Dec 18, 2023
1 parent 673cc6f commit 37db813
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 22 deletions.
6 changes: 1 addition & 5 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,9 @@ jobs:
with:
repository: carla-compose/carla
latest: true
fileName: "*.md"
fileName: "PythonAPI"
out-file-path: artifacts

- name: debug
run: ls artifacts


- uses: docker/build-push-action@v5
name: Build and push
with:
Expand Down
18 changes: 1 addition & 17 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,21 +1,5 @@
ARG UBUNTU_VERSION="22.04"
ARG CARLA_REMOTE_PATH="https://carla-releases.s3.eu-west-3.amazonaws.com/Linux/CARLA_0.9.13.tar.gz"

############ PythonAPI ############
FROM "ubuntu:${UBUNTU_VERSION}" as artifacts

USER root
SHELL ["/bin/bash", "-c"]
ARG CARLA_REMOTE_PATH

# Install wget
RUN apt-get update && \
apt-get install -y \
wget \
&& rm -rf /var/lib/apt/lists/*

# Download and extract API
RUN wget -qO- "${CARLA_REMOTE_PATH}" | tar -xzv PythonAPI/carla

############ dependencies ############
ARG UBUNTU_VERSION
Expand Down Expand Up @@ -48,7 +32,7 @@ COPY . $SCENARIO_RUNNER_PATH
RUN pip3 install -r $SCENARIO_RUNNER_PATH/requirements.txt

# Copy over PythonAPI
COPY --from=artifacts PythonAPI ${CARLA_API_PATH}
COPY artifacts/PythonAPI ${CARLA_API_PATH}

# Recursively install PythonAPI requirements, keep version of first occurrence
RUN cat $(find ${CARLA_API_PATH} -type f -name "requirements.txt") > /tmp/requirements_raw.txt \
Expand Down

0 comments on commit 37db813

Please sign in to comment.