From a77a3f01ad9524f0398234213be264de1c1daa34 Mon Sep 17 00:00:00 2001 From: Fascinated Date: Mon, 27 Mar 2023 21:53:03 +0100 Subject: [PATCH] fixes --- .gitea/workflows/publish.yaml | 27 +-------------------------- gitea-runner/Dockerfile | 1 + 2 files changed, 2 insertions(+), 26 deletions(-) diff --git a/.gitea/workflows/publish.yaml b/.gitea/workflows/publish.yaml index 6beebf6..5f8d58b 100644 --- a/.gitea/workflows/publish.yaml +++ b/.gitea/workflows/publish.yaml @@ -17,17 +17,7 @@ jobs: - name: checkout uses: https://github.com/actions/checkout@v3 - - name: Restore Docker - id: cache-docker - uses: https://github.com/actions/cache/restore@v3 - with: - path: | - /usr/bin/docker - key: ${{ runner.os }}-docker - token: ${{ secrets.GH_TOKEN }} - - name: Download docker - if: steps.cache-docker.outputs.cache-hit != 'true' run: | wget -q -O /tmp/docker.tgz https://download.docker.com/linux/static/stable/x86_64/docker-20.10.23.tgz \ && tar --extract --file /tmp/docker.tgz --directory /usr/bin --strip-components 1 --no-same-owner docker/docker \ @@ -36,14 +26,6 @@ jobs: - name: Set up Docker Buildx uses: https://github.com/docker/setup-buildx-action@v2 - - name: Cache Docker layers - uses: https://github.com/actions/cache@v2 - with: - path: /tmp/.buildx-cache - key: ${{ runner.os }}-buildx-${{ github.sha }} - restore-keys: | - ${{ runner.os }}-buildx- - - name: Login to Repo uses: https://github.com/docker/login-action@v2 with: @@ -56,11 +38,4 @@ jobs: with: push: true context: ./gitea-runner - tags: git.fascinated.cc/fascinated/gitea-runner:ubuntu-latest - cache-from: type=local,src=/tmp/.buildx-cache - cache-to: type=local,dest=/tmp/.buildx-cache-new - - - name: Move cache - run: | - rm -rf /tmp/.buildx-cache - mv /tmp/.buildx-cache-new /tmp/.buildx-cache \ No newline at end of file + tags: git.fascinated.cc/fascinated/gitea-runner:ubuntu-latest \ No newline at end of file diff --git a/gitea-runner/Dockerfile b/gitea-runner/Dockerfile index a23bdf6..a80010c 100644 --- a/gitea-runner/Dockerfile +++ b/gitea-runner/Dockerfile @@ -3,6 +3,7 @@ from ubuntu:latest # Update and install packages RUN apt-get update && apt-get install -y \ git \ + wget \ && rm -rf /var/lib/apt/lists/* RUN echo "Installed packages"