From 15097fdd524cd6613688bc7d60c88162917338dc Mon Sep 17 00:00:00 2001 From: Fascinated Date: Mon, 27 Mar 2023 22:24:52 +0100 Subject: [PATCH] fixes --- .gitea/workflows/publish.yaml | 4 ++-- gitea-runner/Dockerfile | 21 +++------------------ 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/.gitea/workflows/publish.yaml b/.gitea/workflows/publish.yaml index 5f8d58b..0f00619 100644 --- a/.gitea/workflows/publish.yaml +++ b/.gitea/workflows/publish.yaml @@ -33,9 +33,9 @@ jobs: username: ${{ secrets.REPO_USERNAME }} password: ${{ secrets.REPO_TOKEN }} - - name: Build and push - gitea-runner:ubuntu-latest + - name: Build and push uses: docker/build-push-action@v4 with: push: true context: ./gitea-runner - tags: git.fascinated.cc/fascinated/gitea-runner:ubuntu-latest \ No newline at end of file + tags: git.fascinated.cc/fascinated/gitea-runner:latest \ No newline at end of file diff --git a/gitea-runner/Dockerfile b/gitea-runner/Dockerfile index f0d0e6f..45d086f 100644 --- a/gitea-runner/Dockerfile +++ b/gitea-runner/Dockerfile @@ -1,19 +1,4 @@ -from ubuntu:latest +FROM docker:stable -# Disable interactive mode -ARG DEBIAN_FRONTEND=noninteractive - -# Update and install packages -RUN apt update && apt upgrade -y -RUN apt install -y git wget curl -RUN echo "Installed and updated packages" - -# Install Docker -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 \ - && rm -rf /tmp/* -RUN echo "Installed Docker" - -# Clean up apt -RUN rm -rf /var/lib/apt/lists/* -RUN apt clean \ No newline at end of file +# Install packages +RUN apk add --no-cache curl wget git \ No newline at end of file