From 02cbbee625c515cb5a3f368ea588367ce05affba Mon Sep 17 00:00:00 2001 From: erman Date: Wed, 14 May 2025 11:03:21 +0200 Subject: [PATCH] revert ac1648f56cbe1706fe4d36b4f8179649ca5f50cc revert Use latest image as cache Cache needs to be a separate image as it has different format --- .gitea/workflows/release.yml | 4 ++-- Makefile | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index 900886d..fe71df3 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -55,8 +55,8 @@ jobs: push: true tags: "${{ vars.DOCKER_IMAGE }}:latest,${{ vars.DOCKER_IMAGE }}:${{ steps.date.outputs.date }}" platforms: linux/amd64,linux/arm/v7 - cache-to: "mode=max,image-manifest=true,oci-mediatypes=true,type=registry,ref=${{ vars.DOCKER_IMAGE }}:latest" - cache-from: "mode=max,image-manifest=true,oci-mediatypes=true,type=registry,ref=${{ vars.DOCKER_IMAGE }}:latest" + cache-to: "mode=max,image-manifest=true,oci-mediatypes=true,type=registry,ref=${{ vars.DOCKER_IMAGE }}:cache" + cache-from: "mode=max,image-manifest=true,oci-mediatypes=true,type=registry,ref=${{ vars.DOCKER_IMAGE }}:cache" labels: | org.opencontainers.image.created=${{ steps.date.outputs.date }} org.opencontainers.image.authors=Roman Krček diff --git a/Makefile b/Makefile index 43c67d3..0b515a1 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ docker_image := git.orebolt.cz/erman/telegram-downloader-bot ts := $(shell /bin/date "+%Y-%m-%d") -platform = linux/amd64 +platform = linux/arm/v7 # linux/amd64 up: sudo docker compose up --build @@ -16,8 +16,8 @@ cont: release: sudo docker buildx use mybuilder sudo docker buildx build \ - --cache-to mode=max,image-manifest=true,oci-mediatypes=true,type=registry,ref=$(docker_image):latest \ - --cache-from mode=max,image-manifest=true,oci-mediatypes=true,type=registry,ref=$(docker_image):latest \ + --cache-to mode=max,image-manifest=true,oci-mediatypes=true,type=registry,ref=$(docker_image):cache \ + --cache-from mode=max,image-manifest=true,oci-mediatypes=true,type=registry,ref=$(docker_image):cache \ --platform linux/arm/v7,linux/amd64 \ --tag $(docker_image):latest \ --tag $(docker_image):$(ts) \