From a861217affd99db2c4659138d962246723239894 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9=20=D0=91=D0=B0?= =?UTF-8?q?=D0=B4=D1=8F=D0=B5=D0=B2?= Date: Thu, 10 Oct 2024 19:17:20 +0700 Subject: [PATCH] =?UTF-8?q?python:=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=20=D0=BF=D0=B0=D0=BA=D0=B5=D1=82=20dh-python?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/release.yaml | 6 +++--- dockerfiles/base.dockerfile | 2 +- dockerfiles/python.dockerfile | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitea/workflows/release.yaml b/.gitea/workflows/release.yaml index 338723d..9f118d4 100644 --- a/.gitea/workflows/release.yaml +++ b/.gitea/workflows/release.yaml @@ -8,7 +8,7 @@ on: - main jobs: - base: + release: runs-on: ubuntu-latest steps: - name: checkout @@ -48,7 +48,7 @@ jobs: push: true no-cache: true build-args: | - BASE_IMAGE_TAG=ubuntu-22.04 + BASE_IMAGE_TAG=act-22.04 IMAGE_VERSION=${{ steps.meta.outputs.IMAGE_VERSION }} IMAGE_CREATED=${{ steps.meta.outputs.IMAGE_CREATED }} IMAGE_REVISION=${{ steps.meta.outputs.IMAGE_REVISION }} @@ -90,7 +90,7 @@ jobs: push: true no-cache: true build-args: | - BASE_IMAGE_TAG=ubuntu-20.04 + BASE_IMAGE_TAG=act-20.04 IMAGE_VERSION=${{ steps.meta.outputs.IMAGE_VERSION }} IMAGE_CREATED=${{ steps.meta.outputs.IMAGE_CREATED }} IMAGE_REVISION=${{ steps.meta.outputs.IMAGE_REVISION }} diff --git a/dockerfiles/base.dockerfile b/dockerfiles/base.dockerfile index 971bb21..5e57394 100644 --- a/dockerfiles/base.dockerfile +++ b/dockerfiles/base.dockerfile @@ -1,6 +1,6 @@ ARG BASE_IMAGE_TAG -FROM gitea/runner-images:${BASE_IMAGE_TAG} +FROM ghcr.io/catthehacker/ubuntu:${BASE_IMAGE_TAG} ARG IMAGE_CREATED ARG IMAGE_VERSION diff --git a/dockerfiles/python.dockerfile b/dockerfiles/python.dockerfile index 5c34185..2c63702 100644 --- a/dockerfiles/python.dockerfile +++ b/dockerfiles/python.dockerfile @@ -19,5 +19,5 @@ LABEL org.opencontainers.image.created="${IMAGE_CREATED}" \ org.opencontainers.image.description="MouseSoft docker images used by act_runner to run workflows." RUN apt-get update && \ - apt-get install -y libvirt-dev python3-all python3-dev python3-setuptools && \ + apt-get install -y dh-python libvirt-dev python3-all python3-dev python3-setuptools && \ rm -rf /var/lib/apt/lists/*