From 0b17e4d10c1ccdb9d158d095366010083f71f08f Mon Sep 17 00:00:00 2001
From: Emmanuel Bruno <emmanuel.bruno@univ-tln.fr>
Date: Thu, 6 Apr 2023 15:13:41 +0200
Subject: [PATCH] fixes typo.
---
.github/workflows/ci-qemu.yml | 4 ++--
Dockerfile | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/ci-qemu.yml b/.github/workflows/ci-qemu.yml
index ac9a560..5207729 100644
--- a/.github/workflows/ci-qemu.yml
+++ b/.github/workflows/ci-qemu.yml
@@ -83,8 +83,8 @@ jobs:
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
- cache-from: type=registry,ref=${{ secrets.PRIVATEHUB_HOSTNAME }}/${{ env.REPOSITORY_NAME }}:buildcache
- cache-to: type=registry,ref=${{ secrets.PRIVATEHUB_HOSTNAME }}/${{ env.REPOSITORY_NAME }}:buildcache,mode=min,compression=zstd
+ cache-from: type=registry,ref=${{ secrets.PRIVATEHUB_HOSTNAME }}/${{ env.REPOSITORY_NAME }}:${{ env.GITHUB_REF_NAME }}-buildcache
+ cache-to: type=registry,ref=${{ secrets.PRIVATEHUB_HOSTNAME }}/${{ env.REPOSITORY_NAME }}:${{ env.GITHUB_REF_NAME }}-buildcache,mode=min,compression=zstd
- name: Update repo description
uses: peter-evans/dockerhub-description@v3
diff --git a/Dockerfile b/Dockerfile
index 335e4a5..71e6119 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -25,13 +25,13 @@ ENV CONDA_PKG_DIR=/opt/conda/pkgs/
# We need to remove the default `docker-clean` to avoid cache cleaning
RUN mkdir -p ${PIP_CACHE_DIR} && \
rm -f /etc/apt/apt.conf.d/docker-clean && \
- echo "Dir::Cache::pkgcache ${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} && \
cat /etc/apt/apt.conf.d/00-move-cache
COPY Artefacts/apt_packages /tmp/
-RUN --mount=type=cache,target=${APT_CACHE_DIR},sharing=locked \
+RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
apt-get update && \
apt-get install -qq --yes --no-install-recommends \
$(cat /tmp/apt_packages) && \
--
GitLab