diff --git a/.gitea/workflows/node-npm.yaml b/.gitea/workflows/node-npm.yaml index 32aa7ad..3a4fd40 100644 --- a/.gitea/workflows/node-npm.yaml +++ b/.gitea/workflows/node-npm.yaml @@ -17,47 +17,6 @@ jobs: steps: - name: Checkout - uses: https://git.kjan.de/actions/checkout@v4 - - - name: Set up Docker Buildx - uses: https://git.kjan.de/actions/setup-buildx-action@v3 - - - name: Login to local Docker Registry - uses: https://git.kjan.de/actions/login-action@v3 + uses: https://git.kjan.de/actions/docker-build@main with: - registry: git.kjan.de - username: ${{ secrets.REGISTRY_USERNAME }} - password: ${{ secrets.REGISTRY_TOKEN }} - - - name: Login to Docker.io Registry - uses: https://git.kjan.de/actions/login-action@v3 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - - - name: Cache Docker layers - uses: actions/cache@v4 - with: - path: /tmp/.buildx-cache - key: ${{ runner.os }}-node-npm-${{ github.sha }} - restore-keys: | - ${{ runner.os }}-node-npm- - - - 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-npm - push: ${{ github.ref == 'refs/heads/main' }} - tags: | - git.kjan.de/actions/node-npm:latest - git.kjan.de/actions/node-npm:${{ gitea.sha }} - - - # 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 + name: node-npm