From 3dde2de498b9c84e88b1a911c9c88c1fafab1ed2 Mon Sep 17 00:00:00 2001
From: Vladimir Dubrovin <3proxy@3proxy.ru>
Date: Sun, 31 May 2026 13:10:26 +0300
Subject: [PATCH] do not keep untagged dockers

---
 .github/workflows/docker-ghcr.yml | 18 +++++++++++++++---
 .github/workflows/docker.yml      | 10 +++++++---
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/docker-ghcr.yml b/.github/workflows/docker-ghcr.yml
index 041e84a..fda9026 100644
--- a/.github/workflows/docker-ghcr.yml
+++ b/.github/workflows/docker-ghcr.yml
@@ -34,9 +34,10 @@ jobs:
             echo "busybox=${IMAGE}:${RELEASE}.busybox,${IMAGE}:busybox" >> "$GITHUB_OUTPUT"
             echo "full=${IMAGE}:${RELEASE},${IMAGE}:latest" >> "$GITHUB_OUTPUT"
           else
-            echo "minimal=${IMAGE}:devel.minimal" >> "$GITHUB_OUTPUT"
-            echo "busybox=${IMAGE}:devel.busybox" >> "$GITHUB_OUTPUT"
-            echo "full=${IMAGE}:devel" >> "$GITHUB_OUTPUT"
+            DATETIME=$(date +%d%m%y%H%M%S)
+            echo "minimal=${IMAGE}:${DATETIME}-devel.minimal,${IMAGE}:devel.minimal" >> "$GITHUB_OUTPUT"
+            echo "busybox=${IMAGE}:${DATETIME}-devel.busybox,${IMAGE}:devel.busybox" >> "$GITHUB_OUTPUT"
+            echo "full=${IMAGE}:${DATETIME}-devel,${IMAGE}:devel" >> "$GITHUB_OUTPUT"
           fi
 
       - name: Set up QEMU
@@ -60,6 +61,7 @@ jobs:
           file: Dockerfile.minimal
           platforms: linux/amd64,linux/arm64
           push: ${{ github.event_name != 'pull_request' }}
+          no-cache: true
           tags: ${{ steps.tags.outputs.minimal }}
 
       - name: Build and push busybox
@@ -69,6 +71,7 @@ jobs:
           file: Dockerfile.busybox
           platforms: linux/amd64,linux/arm64
           push: ${{ github.event_name != 'pull_request' }}
+          no-cache: true
           tags: ${{ steps.tags.outputs.busybox }}
 
       - name: Build and push full
@@ -78,4 +81,13 @@ jobs:
           file: Dockerfile.full
           platforms: linux/amd64,linux/arm64
           push: ${{ github.event_name != 'pull_request' }}
+          no-cache: true
           tags: ${{ steps.tags.outputs.full }}
+
+      - name: Delete untagged GHCR images
+        if: github.event_name != 'pull_request'
+        uses: actions/delete-package-versions@v5
+        with:
+          package-name: 3proxy
+          package-type: container
+          delete-untagged-versions: true
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 07a1b12..a3fdf40 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -32,9 +32,10 @@ jobs:
             echo "busybox=${REGISTRY}/${IMAGE_NAME}:${RELEASE}.busybox,${REGISTRY}/${IMAGE_NAME}:busybox" >> "$GITHUB_OUTPUT"
             echo "full=${REGISTRY}/${IMAGE_NAME}:${RELEASE},${REGISTRY}/${IMAGE_NAME}:latest" >> "$GITHUB_OUTPUT"
           else
-            echo "minimal=${REGISTRY}/${IMAGE_NAME}:devel.minimal" >> "$GITHUB_OUTPUT"
-            echo "busybox=${REGISTRY}/${IMAGE_NAME}:devel.busybox" >> "$GITHUB_OUTPUT"
-            echo "full=${REGISTRY}/${IMAGE_NAME}:devel" >> "$GITHUB_OUTPUT"
+            DATETIME=$(date +%d%m%y%H%M%S)
+            echo "minimal=${REGISTRY}/${IMAGE_NAME}:${DATETIME}-devel.minimal,${REGISTRY}/${IMAGE_NAME}:devel.minimal" >> "$GITHUB_OUTPUT"
+            echo "busybox=${REGISTRY}/${IMAGE_NAME}:${DATETIME}-devel.busybox,${REGISTRY}/${IMAGE_NAME}:devel.busybox" >> "$GITHUB_OUTPUT"
+            echo "full=${REGISTRY}/${IMAGE_NAME}:${DATETIME}-devel,${REGISTRY}/${IMAGE_NAME}:devel" >> "$GITHUB_OUTPUT"
           fi
 
       - name: Set up QEMU
@@ -57,6 +58,7 @@ jobs:
           file: Dockerfile.minimal
           platforms: linux/amd64,linux/arm64
           push: ${{ github.event_name != 'pull_request' }}
+          no-cache: true
           tags: ${{ steps.tags.outputs.minimal }}
 
       - name: Build and push busybox
@@ -66,6 +68,7 @@ jobs:
           file: Dockerfile.busybox
           platforms: linux/amd64,linux/arm64
           push: ${{ github.event_name != 'pull_request' }}
+          no-cache: true
           tags: ${{ steps.tags.outputs.busybox }}
 
       - name: Build and push full
@@ -75,4 +78,5 @@ jobs:
           file: Dockerfile.full
           platforms: linux/amd64,linux/arm64
           push: ${{ github.event_name != 'pull_request' }}
+          no-cache: true
           tags: ${{ steps.tags.outputs.full }}