From fe3df25fff4de0c61f481afb88d76b1d4a204d3a Mon Sep 17 00:00:00 2001 From: Jan Gleytenhoover Date: Thu, 15 Aug 2024 14:31:18 +0000 Subject: [PATCH 01/10] Update .gitea/workflows/node-npm.yaml --- .gitea/workflows/node-npm.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitea/workflows/node-npm.yaml b/.gitea/workflows/node-npm.yaml index 964b36c..1217e53 100644 --- a/.gitea/workflows/node-npm.yaml +++ b/.gitea/workflows/node-npm.yaml @@ -29,6 +29,9 @@ jobs: username: ${{ secrets.REGISTRY_USERNAME }} password: ${{ secrets.REGISTRY_TOKEN }} + - name: Pull previous image + run: docker pull git.kjan.de/actions/node-npm:latest + - name: Login to Docker.io Registry uses: https://git.kjan.de/actions/login-action@v3 with: -- 2.45.2 From 7c3305446d39d7293489fdbd5067bec1b3e1f009 Mon Sep 17 00:00:00 2001 From: Jan Gleytenhoover Date: Thu, 15 Aug 2024 14:35:04 +0000 Subject: [PATCH 02/10] Update .gitea/workflows/node-npm.yaml --- .gitea/workflows/node-npm.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/node-npm.yaml b/.gitea/workflows/node-npm.yaml index 1217e53..195f2d1 100644 --- a/.gitea/workflows/node-npm.yaml +++ b/.gitea/workflows/node-npm.yaml @@ -29,9 +29,6 @@ jobs: username: ${{ secrets.REGISTRY_USERNAME }} password: ${{ secrets.REGISTRY_TOKEN }} - - name: Pull previous image - run: docker pull git.kjan.de/actions/node-npm:latest - - name: Login to Docker.io Registry uses: https://git.kjan.de/actions/login-action@v3 with: @@ -41,6 +38,8 @@ jobs: - name: Build and push uses: https://git.kjan.de/actions/build-push-action@v6 with: + cache-from: type=registry,ref=actions/node-npm:latest + cache-to: type=inline context: ./images/actions/node-npm push: ${{ github.ref == 'refs/heads/main' }} tags: | -- 2.45.2 From 11a01acf735d05082fc18830c344153e50cf51f1 Mon Sep 17 00:00:00 2001 From: Jan Gleytenhoover Date: Thu, 15 Aug 2024 14:36:31 +0000 Subject: [PATCH 03/10] Update .gitea/workflows/node-npm.yaml --- .gitea/workflows/node-npm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/node-npm.yaml b/.gitea/workflows/node-npm.yaml index 195f2d1..7b89e2b 100644 --- a/.gitea/workflows/node-npm.yaml +++ b/.gitea/workflows/node-npm.yaml @@ -38,7 +38,7 @@ jobs: - name: Build and push uses: https://git.kjan.de/actions/build-push-action@v6 with: - cache-from: type=registry,ref=actions/node-npm:latest + cache-from: type=registry,ref=git.kjan.de/actions/node-npm:latest cache-to: type=inline context: ./images/actions/node-npm push: ${{ github.ref == 'refs/heads/main' }} -- 2.45.2 From aa27f16d3ca8318463c2c5ba486c5c9138fe2784 Mon Sep 17 00:00:00 2001 From: Jan Gleytenhoover Date: Thu, 15 Aug 2024 14:49:50 +0000 Subject: [PATCH 04/10] Update .gitea/workflows/node-npm.yaml --- .gitea/workflows/node-npm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/node-npm.yaml b/.gitea/workflows/node-npm.yaml index 7b89e2b..dd9c216 100644 --- a/.gitea/workflows/node-npm.yaml +++ b/.gitea/workflows/node-npm.yaml @@ -38,8 +38,8 @@ jobs: - name: Build and push uses: https://git.kjan.de/actions/build-push-action@v6 with: - cache-from: type=registry,ref=git.kjan.de/actions/node-npm:latest - cache-to: type=inline + cache-from: type=registry,ref=git.kjan.de/actions/node-npm:buildcache + cache-to: type=registry,ref=git.kjan.de/actions/node-npm:buildcache,mode=max context: ./images/actions/node-npm push: ${{ github.ref == 'refs/heads/main' }} tags: | -- 2.45.2 From 6e8c6da8fb19d9c4b84dba3cce7cd7aa031b1a16 Mon Sep 17 00:00:00 2001 From: Jan Gleytenhoover Date: Thu, 15 Aug 2024 15:02:55 +0000 Subject: [PATCH 05/10] Update .gitea/workflows/node-npm.yaml --- .gitea/workflows/node-npm.yaml | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/node-npm.yaml b/.gitea/workflows/node-npm.yaml index dd9c216..1a0109c 100644 --- a/.gitea/workflows/node-npm.yaml +++ b/.gitea/workflows/node-npm.yaml @@ -35,13 +35,29 @@ jobs: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} + - name: Cache Docker layers + uses: actions/cache@v4 + with: + path: /tmp/.buildx-cache + key: ${{ runner.os }}-buildx-${{ github.sha }} + restore-keys: | + ${{ runner.os }}-buildx- + - name: Build and push uses: https://git.kjan.de/actions/build-push-action@v6 with: - cache-from: type=registry,ref=git.kjan.de/actions/node-npm:buildcache - cache-to: type=registry,ref=git.kjan.de/actions/node-npm:buildcache,mode=max + cache-from: type=local,src=/tmp/.buildx-cache + cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max context: ./images/actions/node-npm push: ${{ github.ref == 'refs/heads/main' }} tags: | git.kjan.de/actions/node-npm:latest - git.kjan.de/actions/node-npm:${{ gitea.run_number }} + git.kjan.de/actions/node-npm:${{ gitea.run_number }} + + - # Temp fix + # https://github.com/docker/build-push-action/issues/252 + # https://github.com/moby/buildkit/issues/1896 + name: Move cache + run: | + rm -rf /tmp/.buildx-cache + mv /tmp/.buildx-cache-new /tmp/.buildx-cache -- 2.45.2 From 6c1793ae8ecc3398c2d256d7c116462c3d37f7be Mon Sep 17 00:00:00 2001 From: Jan Gleytenhoover Date: Thu, 15 Aug 2024 15:23:25 +0000 Subject: [PATCH 06/10] Update .gitea/workflows/node-ssh.yaml --- .gitea/workflows/node-ssh.yaml | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/node-ssh.yaml b/.gitea/workflows/node-ssh.yaml index 0166f1a..0bd63d6 100644 --- a/.gitea/workflows/node-ssh.yaml +++ b/.gitea/workflows/node-ssh.yaml @@ -35,11 +35,29 @@ jobs: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} + - name: Cache Docker layers + uses: actions/cache@v4 + with: + path: /tmp/.buildx-cache + key: ${{ runner.os }}-buildx-${{ github.sha }} + restore-keys: | + ${{ runner.os }}-buildx- + - name: Build and push uses: https://git.kjan.de/actions/build-push-action@v6 with: + cache-from: type=local,src=/tmp/.buildx-cache + cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max context: ./images/actions/node-ssh push: ${{ github.ref == 'refs/heads/main' }} tags: | git.kjan.de/actions/node-ssh:latest - git.kjan.de/actions/node-ssh:${{ gitea.run_number }} + git.kjan.de/actions/node-ssh:${{ gitea.run_number }} + + - # Temp fix + # https://github.com/docker/build-push-action/issues/252 + # https://github.com/moby/buildkit/issues/1896 + name: Move cache + run: | + rm -rf /tmp/.buildx-cache + mv /tmp/.buildx-cache-new /tmp/.buildx-cache -- 2.45.2 From 62bb668a1728669221ea0d160ad165f9c5191f85 Mon Sep 17 00:00:00 2001 From: Jan Gleytenhoover Date: Thu, 15 Aug 2024 15:26:21 +0000 Subject: [PATCH 07/10] Update .gitea/workflows/php-8.2.yaml --- .gitea/workflows/php-8.2.yaml | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/php-8.2.yaml b/.gitea/workflows/php-8.2.yaml index d7cf5a4..6f47169 100644 --- a/.gitea/workflows/php-8.2.yaml +++ b/.gitea/workflows/php-8.2.yaml @@ -35,12 +35,30 @@ jobs: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} + - name: Cache Docker layers + uses: actions/cache@v4 + with: + path: /tmp/.buildx-cache + key: ${{ runner.os }}-buildx-${{ github.sha }} + restore-keys: | + ${{ runner.os }}-buildx- + - name: Build and push uses: https://git.kjan.de/actions/build-push-action@v6 with: + cache-from: type=local,src=/tmp/.buildx-cache + cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max context: ./images/actions/php-8.2 push: ${{ github.ref == 'refs/heads/main' }} tags: | git.kjan.de/actions/php-8.2:latest - git.kjan.de/actions/php-8.2:${{ gitea.run_number }} + git.kjan.de/actions/php-8.2:${{ gitea.run_number }} + + - # Temp fix + # https://github.com/docker/build-push-action/issues/252 + # https://github.com/moby/buildkit/issues/1896 + name: Move cache + run: | + rm -rf /tmp/.buildx-cache + mv /tmp/.buildx-cache-new /tmp/.buildx-cache -- 2.45.2 From 0a833a8b31a01bf82c714be505023f19ad8a496b Mon Sep 17 00:00:00 2001 From: Jan Gleytenhoover Date: Thu, 15 Aug 2024 15:27:35 +0000 Subject: [PATCH 08/10] Update .gitea/workflows/php-deployer.yaml --- .gitea/workflows/php-deployer.yaml | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/php-deployer.yaml b/.gitea/workflows/php-deployer.yaml index 03eee74..e0a146b 100644 --- a/.gitea/workflows/php-deployer.yaml +++ b/.gitea/workflows/php-deployer.yaml @@ -35,11 +35,29 @@ jobs: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} + - name: Cache Docker layers + uses: actions/cache@v4 + with: + path: /tmp/.buildx-cache + key: ${{ runner.os }}-buildx-${{ github.sha }} + restore-keys: | + ${{ runner.os }}-buildx- + - name: Build and push uses: https://git.kjan.de/actions/build-push-action@v6 with: + cache-from: type=local,src=/tmp/.buildx-cache + cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max context: ./images/actions/php-deployer push: ${{ github.ref == 'refs/heads/main' }} tags: | git.kjan.de/actions/php-deployer:latest - git.kjan.de/actions/php-deployer:${{ gitea.run_number }} + git.kjan.de/actions/php-deployer:${{ gitea.run_number }} + + - # Temp fix + # https://github.com/docker/build-push-action/issues/252 + # https://github.com/moby/buildkit/issues/1896 + name: Move cache + run: | + rm -rf /tmp/.buildx-cache + mv /tmp/.buildx-cache-new /tmp/.buildx-cache -- 2.45.2 From 0d76b10cd1b9dd3e539082a1f8e675c31bb9ef5e Mon Sep 17 00:00:00 2001 From: Jan Gleytenhoover Date: Thu, 15 Aug 2024 15:28:28 +0000 Subject: [PATCH 09/10] Update .gitea/workflows/rust-node.yaml --- .gitea/workflows/rust-node.yaml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.gitea/workflows/rust-node.yaml b/.gitea/workflows/rust-node.yaml index 860a5f1..b72b094 100644 --- a/.gitea/workflows/rust-node.yaml +++ b/.gitea/workflows/rust-node.yaml @@ -35,11 +35,29 @@ jobs: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} + - name: Cache Docker layers + uses: actions/cache@v4 + with: + path: /tmp/.buildx-cache + key: ${{ runner.os }}-buildx-${{ github.sha }} + restore-keys: | + ${{ runner.os }}-buildx- + - name: Build and push uses: https://git.kjan.de/actions/build-push-action@v6 with: + cache-from: type=local,src=/tmp/.buildx-cache + cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max context: ./images/actions/rust-node push: ${{ github.ref == 'refs/heads/main' }} tags: | git.kjan.de/actions/rust-node:latest git.kjan.de/actions/rust-node:${{ gitea.run_number }} + + - # Temp fix + # https://github.com/docker/build-push-action/issues/252 + # https://github.com/moby/buildkit/issues/1896 + name: Move cache + run: | + rm -rf /tmp/.buildx-cache + mv /tmp/.buildx-cache-new /tmp/.buildx-cache -- 2.45.2 From cf2cc27fe4cda5ad381f5b1666ea4e6e35539fd0 Mon Sep 17 00:00:00 2001 From: Milkman337 Date: Thu, 15 Aug 2024 18:00:19 +0200 Subject: [PATCH 10/10] change keys --- .gitea/workflows/node-npm.yaml | 4 ++-- .gitea/workflows/node-ssh.yaml | 4 ++-- .gitea/workflows/php-8.2.yaml | 4 ++-- .gitea/workflows/php-deployer.yaml | 4 ++-- .gitea/workflows/rust-node.yaml | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.gitea/workflows/node-npm.yaml b/.gitea/workflows/node-npm.yaml index 1a0109c..25a9718 100644 --- a/.gitea/workflows/node-npm.yaml +++ b/.gitea/workflows/node-npm.yaml @@ -39,9 +39,9 @@ jobs: uses: actions/cache@v4 with: path: /tmp/.buildx-cache - key: ${{ runner.os }}-buildx-${{ github.sha }} + key: ${{ runner.os }}-node-npm-${{ github.sha }} restore-keys: | - ${{ runner.os }}-buildx- + ${{ runner.os }}-node-npm- - name: Build and push uses: https://git.kjan.de/actions/build-push-action@v6 diff --git a/.gitea/workflows/node-ssh.yaml b/.gitea/workflows/node-ssh.yaml index 0bd63d6..72984e9 100644 --- a/.gitea/workflows/node-ssh.yaml +++ b/.gitea/workflows/node-ssh.yaml @@ -39,9 +39,9 @@ jobs: uses: actions/cache@v4 with: path: /tmp/.buildx-cache - key: ${{ runner.os }}-buildx-${{ github.sha }} + key: ${{ runner.os }}-node-ssh-${{ github.sha }} restore-keys: | - ${{ runner.os }}-buildx- + ${{ runner.os }}-node-ssh- - name: Build and push uses: https://git.kjan.de/actions/build-push-action@v6 diff --git a/.gitea/workflows/php-8.2.yaml b/.gitea/workflows/php-8.2.yaml index 6f47169..d34e463 100644 --- a/.gitea/workflows/php-8.2.yaml +++ b/.gitea/workflows/php-8.2.yaml @@ -39,9 +39,9 @@ jobs: uses: actions/cache@v4 with: path: /tmp/.buildx-cache - key: ${{ runner.os }}-buildx-${{ github.sha }} + key: ${{ runner.os }}-php-8-2-${{ github.sha }} restore-keys: | - ${{ runner.os }}-buildx- + ${{ runner.os }}-php-8-2- - name: Build and push uses: https://git.kjan.de/actions/build-push-action@v6 diff --git a/.gitea/workflows/php-deployer.yaml b/.gitea/workflows/php-deployer.yaml index e0a146b..abb3ede 100644 --- a/.gitea/workflows/php-deployer.yaml +++ b/.gitea/workflows/php-deployer.yaml @@ -39,9 +39,9 @@ jobs: uses: actions/cache@v4 with: path: /tmp/.buildx-cache - key: ${{ runner.os }}-buildx-${{ github.sha }} + key: ${{ runner.os }}-php-deployer-${{ github.sha }} restore-keys: | - ${{ runner.os }}-buildx- + ${{ runner.os }}-php-deployer- - name: Build and push uses: https://git.kjan.de/actions/build-push-action@v6 diff --git a/.gitea/workflows/rust-node.yaml b/.gitea/workflows/rust-node.yaml index b72b094..d96fd57 100644 --- a/.gitea/workflows/rust-node.yaml +++ b/.gitea/workflows/rust-node.yaml @@ -39,9 +39,9 @@ jobs: uses: actions/cache@v4 with: path: /tmp/.buildx-cache - key: ${{ runner.os }}-buildx-${{ github.sha }} + key: ${{ runner.os }}-rust-node-${{ github.sha }} restore-keys: | - ${{ runner.os }}-buildx- + ${{ runner.os }}-rust-node- - name: Build and push uses: https://git.kjan.de/actions/build-push-action@v6 -- 2.45.2