From d6e4ece79b5c9b4bcdc119ff4f253cd189c8a40e Mon Sep 17 00:00:00 2001 From: Philipp Hofer Date: Mon, 19 May 2025 18:03:09 +0200 Subject: [PATCH] ci --- .gitea/workflows/docker-build.yml | 17 ++++++++++++++++- rust-latest/Dockerfile | 1 - 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/docker-build.yml b/.gitea/workflows/docker-build.yml index 658014f..4145f7a 100644 --- a/.gitea/workflows/docker-build.yml +++ b/.gitea/workflows/docker-build.yml @@ -8,11 +8,26 @@ on: jobs: build-and-push: runs-on: ubuntu-latest - container: docker:latest + container: git.hofer.link/philipp/ci-images:rust-latest steps: - name: Checkout code uses: actions/checkout@v3 + # Install Docker if not available + - name: Install Docker + run: | + if ! command -v docker &> /dev/null; then + echo "Installing Docker..." + apt-get update + apt-get install -y apt-transport-https ca-certificates curl software-properties-common + curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - + add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" + apt-get update + apt-get install -y docker-ce docker-ce-cli containerd.io + else + echo "Docker is already installed" + fi + # Determine which image to build - name: Set image details id: image_details diff --git a/rust-latest/Dockerfile b/rust-latest/Dockerfile index 049ec17..8149b4a 100644 --- a/rust-latest/Dockerfile +++ b/rust-latest/Dockerfile @@ -7,7 +7,6 @@ FROM rust:1.87 - RUN apt-get update && apt-get install -y sqlite3 # nodejs