From 7940a32803cb98b613afd57518710ec0c8a5e2af Mon Sep 17 00:00:00 2001 From: flifloo Date: Fri, 16 Feb 2024 23:05:53 +0100 Subject: [PATCH] Simplify CI --- .forgejo/workflows/docker.yaml | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/.forgejo/workflows/docker.yaml b/.forgejo/workflows/docker.yaml index 1ba89c0..4380fcc 100644 --- a/.forgejo/workflows/docker.yaml +++ b/.forgejo/workflows/docker.yaml @@ -26,17 +26,27 @@ jobs: echo "DOCKER_TAG=$DOCKER_REPOSITORY/$(echo "$GITHUB_REPOSITORY" | tr '[:upper:]' '[:lower:]'):latest" >> "$GITHUB_ENV" apk add --no-cache git nodejs + - name: "Setup cache" + uses: https://code.forgejo.org/actions/cache@v4 + with: + path: "${{ env.GITHUB_WORKSPACE }}/.docker_cache" + key: "docker" + + - name: Set up Docker Buildx + uses: https://github.com/docker/setup-buildx-action@v3 + - name: "Login to Docker repository" - id: login - run: docker login -u "$GITHUB_ACTOR" -p "${{ secrets.PACKAGE_TOKEN }}" "$DOCKER_REPOSITORY" + uses: https://github.com/docker/login-action@v3 + with: + registry: "${{ env.DOCKER_REPOSITORY }}" + username: "${{ env.GITHUB_ACTOR }}" + password: "${{ secrets.PACKAGE_TOKEN }}" - - name: "Get repo" - uses: https://code.forgejo.org/actions/checkout@v4 - - - name: "Build Docker image" - id: build - run: docker buildx build --pull --platform linux/amd64 -t "$DOCKER_TAG" . - - - name: "Publish Docker image" - id: push - run: docker push "$DOCKER_TAG" + - name: "Build and push" + uses: https://github.com/docker/build-push-action@v5 + with: + context: . + push: true + tags: "${{ env.DOCKER_TAG }}" + cache-from: "type=local,dest=${{ env.GITHUB_WORKSPACE }}/.docker_cache" + cache-to: "type=local,dest=${{ env.GITHUB_WORKSPACE }}/.docker_cache"