From ea1cf934562099c34a41c5ff454ed13d507a1b55 Mon Sep 17 00:00:00 2001 From: ThePhaseless Date: Fri, 28 Feb 2025 19:16:09 +0100 Subject: [PATCH] remove apt caching --- .github/workflows/docker-publish.yml | 21 --------------------- Dockerfile | 8 ++------ 2 files changed, 2 insertions(+), 27 deletions(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 980dbd2..467c09d 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -95,27 +95,6 @@ jobs: tags: type=raw,value=${{ steps.vars.outputs.LOCAL_TAG }} images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} - - name: Set up apt cache - uses: actions/cache@v4 - id: cache - with: - path: | - var-cache-apt - var-lib-apt - /root/.cache/uv - key: cache-${{ hashFiles('Dockerfile') }}-${{ steps.vars.outputs.SURFIX }} - - - name: Inject cache into docker - uses: reproducible-containers/buildkit-cache-dance@v3.1.2 - with: - cache-map: | - { - "var-cache-apt": "/var/cache/apt", - "var-lib-apt": "/var/lib/apt", - "root-cache-uv": "/root/.cache/uv" - } - skip-extraction: ${{ steps.cache.outputs.cache-hit }} - # Build and export Docker image for each platform (without pushing) - name: Build Docker image id: build diff --git a/Dockerfile b/Dockerfile index 94663d1..994db70 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,12 +15,8 @@ ENV PATH="${HOME}/.local/bin:$PATH" WORKDIR /app -RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ - --mount=type=cache,target=/var/lib/apt,sharing=locked \ - rm -f /etc/apt/apt.conf.d/docker-clean && \ - echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' >/etc/apt/apt.conf.d/keep-cache && \ - apt update && \ - apt install -y --no-install-recommends --no-install-suggests xauth xvfb scrot wget chromium chromium-driver ca-certificates +RUN apt-get update && \ + apt-get install -y --no-install-recommends --no-install-suggests xauth xvfb scrot wget chromium chromium-driver ca-certificates ADD https://astral.sh/uv/install.sh install.sh RUN sh install.sh