From 37db8136796b625deb2bf528cf829898a275cb55 Mon Sep 17 00:00:00 2001
From: Christian Geller <christian.geller@ika.rwth-aachen.de>
Date: Mon, 18 Dec 2023 18:12:19 +0100
Subject: [PATCH] update Dockerfile for release processing

---
 .github/workflows/docker.yml |  6 +-----
 docker/Dockerfile            | 18 +-----------------
 2 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 99df24cc1..383d2f34e 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -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:
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 5fd176480..74c3e013d 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -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
@@ -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 \