From 0cb174eea4b7896a937f4767095d5743ae274f69 Mon Sep 17 00:00:00 2001 From: kamkow1 Date: Fri, 3 Apr 2026 19:14:53 +0200 Subject: [PATCH] ci Use custom container image --- .gitea/workflows/build_iso.yaml | 22 ++++++---------------- .gitea/workflows/docs.yaml | 21 ++++++--------------- Dockerfile.deploy | 22 ++++++++++++++++++++++ Dockerfile => Dockerfile.localdev | 0 aux/docker_devel.sh | 2 +- 5 files changed, 35 insertions(+), 32 deletions(-) create mode 100644 Dockerfile.deploy rename Dockerfile => Dockerfile.localdev (100%) diff --git a/.gitea/workflows/build_iso.yaml b/.gitea/workflows/build_iso.yaml index 5ec37f6..7872aef 100644 --- a/.gitea/workflows/build_iso.yaml +++ b/.gitea/workflows/build_iso.yaml @@ -7,26 +7,16 @@ on: jobs: build-and-deploy: - runs-on: ubuntu-22.04 + runs-on: mop3-latest + container: + image: git.kamkow1lair.pl/kamkow1/mop3/mop3-deploy:latest + credentials: + username: kamkow1 + password: ${{ secrets.GITEA_TOKEN }} steps: - name: Check out repository uses: actions/checkout@v4 - - name: Add LLVM APT repo - run: | - wget https://apt.llvm.org/llvm.sh - chmod +x llvm.sh - sudo ./llvm.sh 21 - - - name: Install software - run: | - sudo apt-add-repository universe - sudo apt-get update - sudo apt-get install -y make rsync clang-21 clang-tools-21 bear llvm-21 lld xorriso - sudo ln -sf /usr/bin/clang-21 /usr/bin/clang - sudo ln -sf /usr/bin/clang-doc-21 /usr/bin/clang-doc - sudo ln -sf /usr/bin/llvm-ar-21 /usr/bin/llvm-ar - - name: Build release run: ./aux/devel.sh diff --git a/.gitea/workflows/docs.yaml b/.gitea/workflows/docs.yaml index afb0246..c8440fa 100644 --- a/.gitea/workflows/docs.yaml +++ b/.gitea/workflows/docs.yaml @@ -7,25 +7,16 @@ on: jobs: build-and-deploy: - runs-on: ubuntu-22.04 + runs-on: mop3-latest + container: + image: git.kamkow1lair.pl/kamkow1/mop3/mop3-deploy:latest + credentials: + username: kamkow1 + password: ${{ secrets.GITEA_TOKEN }} steps: - name: Check out repository uses: actions/checkout@v4 - - name: Add LLVM APT repo - run: | - wget https://apt.llvm.org/llvm.sh - chmod +x llvm.sh - sudo ./llvm.sh 21 - - - name: Install software - run: | - sudo apt-get update - sudo apt-get install -y make rsync clang-21 clang-tools-21 bear llvm-21 - sudo ln -sf /usr/bin/clang-21 /usr/bin/clang - sudo ln -sf /usr/bin/clang-doc-21 /usr/bin/clang-doc - sudo ln -sf /usr/bin/llvm-ar-21 /usr/bin/llvm-ar - - name: Set up python3 uses: actions/setup-python@v5 with: diff --git a/Dockerfile.deploy b/Dockerfile.deploy new file mode 100644 index 0000000..6d794c1 --- /dev/null +++ b/Dockerfile.deploy @@ -0,0 +1,22 @@ +FROM ubuntu:22.04 + +ENV DEBIAN_FRONTEND=noninteractive + +RUN apt-get update + +RUN apt-get install -y software-properties-common + +RUN apt-add-repository universe && apt-get update + +RUN apt-get install -y wget + +RUN wget https://apt.llvm.org/llvm.sh -O /llvm.sh && chmod +x /llvm.sh && /llvm.sh 21 + +RUN apt-get install -y make rsync clang-21 clang-tools-21 llvm-21 bear lld xorriso \ + zip gnupg openssh-client + +RUN ln -sf /usr/bin/clang-21 /usr/bin/clang && \ + ln -sf /usr/bin/clang-doc-21 /usr/bin/clang-doc && \ + ln -sf /usr/bin/llvm-ar-21 /usr/bin/llvm-ar + +CMD ["/bin/bash"] diff --git a/Dockerfile b/Dockerfile.localdev similarity index 100% rename from Dockerfile rename to Dockerfile.localdev diff --git a/aux/docker_devel.sh b/aux/docker_devel.sh index 3f710c5..1e6a3a6 100755 --- a/aux/docker_devel.sh +++ b/aux/docker_devel.sh @@ -1,3 +1,3 @@ #!/bin/sh -docker build --progress=plain --build-arg bt="$1" --output . . +docker build -f Dockerfile.localdev --progress=plain --build-arg bt="$1" --output . .