From 23c761b4f87e8b284d5f7991a3d8855a53918923 Mon Sep 17 00:00:00 2001 From: Petr Polezhaev Date: Sat, 7 Feb 2026 19:56:56 +0300 Subject: [PATCH] Fix the dockerfile and workflow --- .gitea/workflows/build.yml | 3 +++ Dockerfile | 34 +++++++++++++++++++++++++++------- 2 files changed, 30 insertions(+), 7 deletions(-) diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index 21cfe9a..609e1f2 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -35,3 +35,6 @@ jobs: push: ${{github.event_name != 'pull_request'}} tags: ${{steps.meta.outputs.tags}} labels: ${{steps.meta.outputs.labels}} + build-args: + - VERSION=v5.7.1 + - REPO_MIRROR=${{vars.REPO_MIRROR}} diff --git a/Dockerfile b/Dockerfile index acd2802..fa2edd1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,28 @@ -FROM podman/stable:latest +ARG VERSION -RUN dnf install -y \ - podman-docker \ - podman-compose \ - && dnf clean all \ - && rm -rf /var/cache/yum \ - && touch /etc/containers/nodocker +FROM quay.io/podman/stable:${VERSION} + +ARG REPO_MIRROR + +RUN set -e; \ + source /etc/os-release; \ + export ARCH=`uname -m`; \ + if ! test -z "${REPO_MIRROR}"; then \ + dnf config-manager setopt \ + fedora.baseurl=${REPO_MIRROR}/fedora/linux/updates/${VERSION_ID}/Everything/${ARCH}/; \ + dnf config-manager setopt fedora.metalink=; \ + dnf config-manager setopt \ + updates.baseurl=${REPO_MIRROR}/fedora/linux/releases/${VERSION_ID}/Everything/${ARCH}/os/; \ + dnf config-manager setopt updates.metalink=; \ + fi; \ + dnf install -y podman-docker; + +RUN set -e; \ + touch /etc/containers/nodocker; \ + mkdir /run/podman; + +RUN set -e; \ + dnf clean all; \ + rm -rf /var/cache/yum; + +ENTRYPOINT ["/usr/bin/podman", "system", "service", "--time", "0", "unix:///run/podman/podman.sock"]