diff --git a/api/Dockerfile b/api/Dockerfile index cbcab80cc2f0e7e46611b259b42a10e84f893f95..7272314c0a79418021a63e46563450ba70b647bf 100755 --- a/api/Dockerfile +++ b/api/Dockerfile @@ -3,7 +3,8 @@ ARG ENV_TYPE ARG GIT_COMMIT_SHA FROM registry.git.fsmpi.rwth-aachen.de/videoag/backend/${ENV_TYPE}_common_py:${GIT_COMMIT_SHA} -ARG PIP_CACHE_DIR +# used by pip as env var +ARG PIP_CACHE_DIR= ENV VIDEOAG_API_GIT_COMMIT_HASH $GIT_COMMIT_SHA diff --git a/generate_ci_pipeline.py b/generate_ci_pipeline.py index 0d5e18c0ec822d43debc3b2c7d4c09fe97a27174..c123dd8edfa4f860e70aada42cda34c469145a61 100644 --- a/generate_ci_pipeline.py +++ b/generate_ci_pipeline.py @@ -95,6 +95,7 @@ echo "{\\"auths\\":{\\"$CI_REGISTRY\\":{\\"username\\":\\"$CI_REGISTRY_USER\\",\ # See https://github.com/GoogleContainerTools/kaniko/issues/969#issuecomment-2160910028 f"--build-arg=PIP_CACHE_DIR=$CI_PROJECT_DIR/.cache/pip", + f"--build-arg=APT_CACHE_DIR=$CI_PROJECT_DIR/.cache/apt", f"--cache=true", ] @@ -113,6 +114,7 @@ echo "{\\"auths\\":{\\"$CI_REGISTRY\\":{\\"username\\":\\"$CI_REGISTRY_USER\\",\ key: videoag-cache-{self.context.env_type()} paths: - .cache/pip + - .cache/apt script: - {self._get_auth_echo()} - echo {self.context.commit_sha} diff --git a/job_controller/Dockerfile b/job_controller/Dockerfile index 677adfd6f1c9d6351d100d59f05956c373f7f67e..86768f2b68f55585fdd59ea8f3393996f627647c 100644 --- a/job_controller/Dockerfile +++ b/job_controller/Dockerfile @@ -3,7 +3,8 @@ ARG ENV_TYPE ARG GIT_COMMIT_SHA FROM registry.git.fsmpi.rwth-aachen.de/videoag/backend/${ENV_TYPE}_common_py:${GIT_COMMIT_SHA} -ARG PIP_CACHE_DIR +# used by pip as env var +ARG PIP_CACHE_DIR= # Empty by default ARG GIT_COMMIT_TAG= diff --git a/job_controller/jobs/ffmpeg_base/Dockerfile b/job_controller/jobs/ffmpeg_base/Dockerfile index adf7f36b9a7605d7394785a5c7bcbc4f62937db1..b1ea20abe4408d85539133d92858f22a139f95c6 100644 --- a/job_controller/jobs/ffmpeg_base/Dockerfile +++ b/job_controller/jobs/ffmpeg_base/Dockerfile @@ -5,6 +5,9 @@ ARG ENV_TYPE ARG GIT_COMMIT_SHA FROM registry.git.fsmpi.rwth-aachen.de/videoag/backend/${ENV_TYPE}_job_base:${GIT_COMMIT_SHA} +ARG APT_CACHE_DIR= +RUN if [[ ! -z "$APT_CACHE_DIR" ]]; then echo "Dir::Cache::Archives $APT_CACHE_DIR" >> /etc/apt/apt.conf.d/ci_caching; fi + RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ --mount=type=cache,target=/var/lib/apt,sharing=locked \ apt-get update && apt-get --no-install-recommends install -y ffmpeg