From 9a49e4c2d283cd5aa3c4e80f957710700ae39df0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20K=C3=BCnzel?= <simonk@fsmpi.rwth-aachen.de>
Date: Fri, 28 Feb 2025 04:33:17 +0100
Subject: [PATCH] fixup! Add package caching for CI
---
common_py/Dockerfile | 4 ++--
job_controller/jobs/ffmpeg_base/Dockerfile | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/common_py/Dockerfile b/common_py/Dockerfile
index 265644c..5b7c3d2 100755
--- a/common_py/Dockerfile
+++ b/common_py/Dockerfile
@@ -4,8 +4,8 @@ FROM python:3.13-slim AS base
ARG PIP_CACHE_DIR=
ARG APT_CACHE_DIR=
RUN rm -f /etc/apt/apt.conf.d/docker-clean
-RUN if ! [ -z "$APT_CACHE_DIR" ]; then echo "Dir::Cache::Archives '$APT_CACHE_DIR'" > /etc/apt/apt.conf.d/ci_caching; fi
-RUN cat /etc/apt/apt.conf.d/ci_caching
+RUN if ! [ -z "$APT_CACHE_DIR" ]; then echo "Dir::Cache::Archives '$APT_CACHE_DIR';" > /etc/apt/apt.conf.d/ci_caching; fi
+
WORKDIR /code
diff --git a/job_controller/jobs/ffmpeg_base/Dockerfile b/job_controller/jobs/ffmpeg_base/Dockerfile
index 207aec9..6006611 100644
--- a/job_controller/jobs/ffmpeg_base/Dockerfile
+++ b/job_controller/jobs/ffmpeg_base/Dockerfile
@@ -8,7 +8,7 @@ FROM registry.git.fsmpi.rwth-aachen.de/videoag/backend/${ENV_TYPE}_job_base:${GI
# READ THE NOTE on caching in the README before changing this/for more info!
ARG APT_CACHE_DIR=
RUN rm -f /etc/apt/apt.conf.d/docker-clean
-RUN if ! [ -z "$APT_CACHE_DIR" ]; then echo "Dir::Cache::Archives $APT_CACHE_DIR" > /etc/apt/apt.conf.d/ci_caching; fi
+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 \
--
GitLab