From 505eb5f2edf69b8a53fca904266921e99cbf32be Mon Sep 17 00:00:00 2001
From: Emmanuel Bruno <emmanuel.bruno@univ-tln.fr>
Date: Thu, 6 Apr 2023 14:31:25 +0200
Subject: [PATCH] prevents race on cache.
---
.github/workflows/ci-qemu.yml | 3 ++-
Dockerfile | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/ci-qemu.yml b/.github/workflows/ci-qemu.yml
index 66282a9..af107a3 100644
--- a/.github/workflows/ci-qemu.yml
+++ b/.github/workflows/ci-qemu.yml
@@ -62,7 +62,8 @@ jobs:
config-inline: |
[registry."docker.io"]
mirrors = ["${{ secrets.DOCKERHUB_PROXY_HOSTNAME }}"]
- http = true
+ [registry."${{ secrets.DOCKERHUB_PROXY_HOSTNAME }}"]
+ http = true
insecure = true
[registry."${{ secrets.PRIVATEHUB_HOSTNAME }}"]
http = true
diff --git a/Dockerfile b/Dockerfile
index 18183d3..f13d033 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,7 +17,7 @@ RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM"
# Sets a cache for pip packages
#ENV PIP_CACHE_DIR=/var/cache/buildkit/pip
-ENV PIP_CACHE_DIR=/home/jovyan/work/var/cache/buildkit/pip
+ENV PIP_CACHE_DIR=/home/jovyan/work/var/cache/buildkit/pip/${TARGETPLATFORM}
ENV APT_CACHE_DIR=/var/cache/apt/${TARGETPLATFORM}
ENV CONDA_PKG_DIR=/opt/conda/pkgs/${TARGETPLATFORM}
@@ -26,7 +26,7 @@ ENV CONDA_PKG_DIR=/opt/conda/pkgs/${TARGETPLATFORM}
RUN mkdir -p ${PIP_CACHE_DIR} && \
mkdir -p ${APT_CACHE_DIR} && \
rm -f /etc/apt/apt.conf.d/docker-clean && \
- echo "dir::cache::archives ${APT_CACHE_DIR}" > /etc/apt/apt.conf.d/00-move-cache && \
+ echo "Dir::Cache::pkgcache ${APT_CACHE_DIR}" > /etc/apt/apt.conf.d/00-move-cache && \
mkdir -p ${CONDA_PKG_DIR}
COPY Artefacts/apt_packages /tmp/
--
GitLab