From 8baf899b615dedaf6fdd80cfe9984f007d8f3227 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20K=C3=BCnzel?= <simonk@fsmpi.rwth-aachen.de>
Date: Tue, 25 Feb 2025 21:44:34 +0100
Subject: [PATCH] !fixup Add package caching for CI
---
api/Dockerfile | 5 +++--
common_py/Dockerfile | 4 ++--
generate_ci_pipeline.py | 2 ++
job_controller/Dockerfile | 3 +--
4 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/api/Dockerfile b/api/Dockerfile
index d1f6de1..0836f92 100755
--- a/api/Dockerfile
+++ b/api/Dockerfile
@@ -1,10 +1,11 @@
-ARG PIP_CACHE_DIR
-
# Can be "development" or "production"
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
+RUN echo ${PIP_CACHE_DIR}
+
ENV VIDEOAG_API_GIT_COMMIT_HASH $GIT_COMMIT_SHA
COPY extra_requirements.txt ./
diff --git a/common_py/Dockerfile b/common_py/Dockerfile
index c5ac8fc..f239901 100755
--- a/common_py/Dockerfile
+++ b/common_py/Dockerfile
@@ -1,7 +1,7 @@
-ARG PIP_CACHE_DIR
-
FROM python:3.12
+ARG PIP_CACHE_DIR
+
WORKDIR /code
RUN mkdir -p /code
diff --git a/generate_ci_pipeline.py b/generate_ci_pipeline.py
index c1a8051..946e458 100644
--- a/generate_ci_pipeline.py
+++ b/generate_ci_pipeline.py
@@ -92,6 +92,8 @@ echo "{\\"auths\\":{\\"$CI_REGISTRY\\":{\\"username\\":\\"$CI_REGISTRY_USER\\",\
f"--destination=$CI_REGISTRY_IMAGE/{self.versioned_full_name()}",
f"--build-arg=GIT_COMMIT_SHA={self.context.commit_sha}",
f"--build-arg=ENV_TYPE={self.context.env_type()}",
+
+ # See https://github.com/GoogleContainerTools/kaniko/issues/969#issuecomment-2160910028
f"--build-arg=PIP_CACHE_DIR=$CI_PROJECT_DIR/.cache/pip",
f"--cache=true",
]
diff --git a/job_controller/Dockerfile b/job_controller/Dockerfile
index 1cb272a..677adfd 100644
--- a/job_controller/Dockerfile
+++ b/job_controller/Dockerfile
@@ -1,10 +1,9 @@
-ARG PIP_CACHE_DIR
-
# Can be "development" or "production"
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
# Empty by default
ARG GIT_COMMIT_TAG=
--
GitLab