From fa489baac76a6f3ba921c342dbfbe786caf7c2d4 Mon Sep 17 00:00:00 2001 From: Job79 Date: Sun, 19 Oct 2025 20:43:25 +0200 Subject: [PATCH] refactor: rename base to fedora --- .gitea/workflows/ci.yaml | 12 ++++++------ containers/{base => fedora}/Containerfile | 0 containers/{base => fedora}/config/bashrc | 0 containers/{base => fedora}/config/bin/host | 0 containers/{base => fedora}/config/bin/podman | 0 containers/{base => fedora}/config/bin/xdg-open | 0 containers/{base => fedora}/config/git | 0 containers/go/Containerfile | 2 +- containers/infra/Containerfile | 2 +- 9 files changed, 8 insertions(+), 8 deletions(-) rename containers/{base => fedora}/Containerfile (100%) rename containers/{base => fedora}/config/bashrc (100%) rename containers/{base => fedora}/config/bin/host (100%) rename containers/{base => fedora}/config/bin/podman (100%) rename containers/{base => fedora}/config/bin/xdg-open (100%) rename containers/{base => fedora}/config/git (100%) diff --git a/.gitea/workflows/ci.yaml b/.gitea/workflows/ci.yaml index ecfe8ef..1b307a4 100644 --- a/.gitea/workflows/ci.yaml +++ b/.gitea/workflows/ci.yaml @@ -8,7 +8,7 @@ on: - cron: "0 16 * * FRI" jobs: - base-build: + fedora-build: runs-on: job-latest steps: - name: Clone repo @@ -21,15 +21,15 @@ jobs: registry: git.plabble.org username: ${{ secrets.REGISTRY_USERNAME }} password: ${{ secrets.REGISTRY_TOKEN }} - - name: Build and push base container + - name: Build and push fedora container uses: docker/build-push-action@v5 with: - context: ./containers/base - file: ./containers/base/Containerfile + context: ./containers/fedora + file: ./containers/fedora/Containerfile push: true tags: | - git.plabble.org/job79/base:${{ github.ref_name }} - git.plabble.org/job79/base:latest + git.plabble.org/job79/fedora:${{ github.ref_name }} + git.plabble.org/job79/fedora:latest - name: Build and push go container uses: docker/build-push-action@v5 with: diff --git a/containers/base/Containerfile b/containers/fedora/Containerfile similarity index 100% rename from containers/base/Containerfile rename to containers/fedora/Containerfile diff --git a/containers/base/config/bashrc b/containers/fedora/config/bashrc similarity index 100% rename from containers/base/config/bashrc rename to containers/fedora/config/bashrc diff --git a/containers/base/config/bin/host b/containers/fedora/config/bin/host similarity index 100% rename from containers/base/config/bin/host rename to containers/fedora/config/bin/host diff --git a/containers/base/config/bin/podman b/containers/fedora/config/bin/podman similarity index 100% rename from containers/base/config/bin/podman rename to containers/fedora/config/bin/podman diff --git a/containers/base/config/bin/xdg-open b/containers/fedora/config/bin/xdg-open similarity index 100% rename from containers/base/config/bin/xdg-open rename to containers/fedora/config/bin/xdg-open diff --git a/containers/base/config/git b/containers/fedora/config/git similarity index 100% rename from containers/base/config/git rename to containers/fedora/config/git diff --git a/containers/go/Containerfile b/containers/go/Containerfile index cc2a2c7..06e2118 100644 --- a/containers/go/Containerfile +++ b/containers/go/Containerfile @@ -1,4 +1,4 @@ -FROM git.plabble.org/job79/base:latest +FROM git.plabble.org/job79/fedora USER root RUN dnf -y install go USER user diff --git a/containers/infra/Containerfile b/containers/infra/Containerfile index 7deebe8..c816bf2 100644 --- a/containers/infra/Containerfile +++ b/containers/infra/Containerfile @@ -1,4 +1,4 @@ -FROM git.plabble.org/job79/base:latest +FROM git.plabble.org/job79/fedora USER root RUN dnf -y install kubectl openssl RUN curl -sL https://talos.dev/install | sh