From 34c62e86588d874a7440c952558a0e3d7a44da15 Mon Sep 17 00:00:00 2001 From: Glax Date: Sun, 29 Sep 2024 00:50:53 +0200 Subject: [PATCH] Remove cache step from cuttingedge workflow, set --platform to TARGETPLATFORM instead --- .../workflows/docker-image-cuttingedge.yml | 21 +------------------ Dockerfile | 6 +++--- 2 files changed, 4 insertions(+), 23 deletions(-) diff --git a/.github/workflows/docker-image-cuttingedge.yml b/.github/workflows/docker-image-cuttingedge.yml index 5f79ff8..32277fd 100644 --- a/.github/workflows/docker-image-cuttingedge.yml +++ b/.github/workflows/docker-image-cuttingedge.yml @@ -11,26 +11,7 @@ jobs: runs-on: ubuntu-latest - steps: - - name: Clear cache - uses: actions/github-script@v6 - with: - script: | - console.log("About to clear") - const caches = await github.rest.actions.getActionsCacheList({ - owner: context.repo.owner, - repo: context.repo.repo, - }) - for (const cache of caches.data.actions_caches) { - console.log(cache) - github.rest.actions.deleteActionsCacheById({ - owner: context.repo.owner, - repo: context.repo.repo, - cache_id: cache.id, - }) - } - console.log("Clear completed") - + steps: - name: Checkout uses: actions/checkout@v4 diff --git a/Dockerfile b/Dockerfile index 1ffcca0..db59cd8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 ARG DOTNET=8.0 -FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/runtime:$DOTNET AS base +FROM --platform=$TARGETPLATFORM mcr.microsoft.com/dotnet/runtime:$DOTNET AS base WORKDIR /publish ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true ENV PUPPETEER_EXECUTABLE_PATH=/usr/bin/chromium @@ -10,7 +10,7 @@ RUN apt-get update \ && apt-get autopurge -y \ && apt-get autoclean -y -FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:$DOTNET AS build-env +FROM --platform=$TARGETPLATFORM mcr.microsoft.com/dotnet/sdk:$DOTNET AS build-env WORKDIR /src COPY Tranga.sln /src @@ -22,7 +22,7 @@ RUN dotnet restore /src/Tranga.sln COPY . /src/ RUN dotnet publish -c Release --property:OutputPath=/publish -maxcpucount:1 -FROM --platform=$BUILDPLATFORM base AS runtime +FROM --platform=$TARGETPLATFORM base AS runtime EXPOSE 6531 ARG UNAME=tranga ARG UID=1000