From d3f1a4e15fac42e1bffd74b93ec45bc20132d8d1 Mon Sep 17 00:00:00 2001 From: Philipp Hofer Date: Mon, 19 May 2025 17:50:07 +0200 Subject: [PATCH 01/11] try ci --- .gitea/workflows/docker-build.yml | 47 +++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 .gitea/workflows/docker-build.yml diff --git a/.gitea/workflows/docker-build.yml b/.gitea/workflows/docker-build.yml new file mode 100644 index 0000000..50bb84a --- /dev/null +++ b/.gitea/workflows/docker-build.yml @@ -0,0 +1,47 @@ +name: Build and Push Docker Images + +on: + push: + paths: + - '*/Dockerfile' + +jobs: + build-and-push: + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v3 + + # Determine which image to build + - name: Set image details + id: image_details + run: | + # Extract the directory of the changed Dockerfile + CHANGED_FILE="${{ github.event.commits[0].modified[0] }}" + if [[ $CHANGED_FILE == */Dockerfile ]]; then + IMAGE_PATH=$(dirname "$CHANGED_FILE") + else + IMAGE_PATH="rust-latest" # Default + fi + + # Set outputs + echo "image_path=$IMAGE_PATH" >> $GITHUB_OUTPUT + echo "image_name=$(basename $IMAGE_PATH)" >> $GITHUB_OUTPUT + + echo "Building image from directory: $IMAGE_PATH" + echo "Image name: $(basename $IMAGE_PATH)" + + - name: Login to Gitea Docker Registry + uses: docker/login-action@v2 + with: + registry: git.hofer.link + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + + - name: Build and Push Docker image + uses: docker/build-push-action@v4 + with: + context: ./${{ steps.image_details.outputs.image_path }} + push: true + tags: git.hofer.link/philipp/ci-images:${{ steps.image_details.outputs.image_name }} + -- 2.49.1 From ebbeeebc38b8c18810d5549cf8679f72b0efe131 Mon Sep 17 00:00:00 2001 From: Philipp Hofer Date: Mon, 19 May 2025 17:51:45 +0200 Subject: [PATCH 02/11] trigger ci --- rust-latest/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust-latest/Dockerfile b/rust-latest/Dockerfile index 69866f9..8149b4a 100644 --- a/rust-latest/Dockerfile +++ b/rust-latest/Dockerfile @@ -5,7 +5,7 @@ # 2. Tag the image: `docker tag git.hofer.link/philipp/ci-images:rust-latest` # 3. Push the image: `docker push git.hofer.link/philipp/ci-images:rust-latest` -FROM rust:1.86 +FROM rust:1.87 RUN apt-get update && apt-get install -y sqlite3 -- 2.49.1 From 46513a3146be0db9fa2308ebfffd983ed8f930d4 Mon Sep 17 00:00:00 2001 From: Philipp Hofer Date: Mon, 19 May 2025 17:54:41 +0200 Subject: [PATCH 03/11] ci --- .gitea/workflows/docker-build.yml | 1 + rust-latest/Dockerfile | 1 + 2 files changed, 2 insertions(+) diff --git a/.gitea/workflows/docker-build.yml b/.gitea/workflows/docker-build.yml index 50bb84a..eda3cd7 100644 --- a/.gitea/workflows/docker-build.yml +++ b/.gitea/workflows/docker-build.yml @@ -8,6 +8,7 @@ on: jobs: build-and-push: runs-on: ubuntu-latest + container: git.hofer.link/philipp/ci-images:rust-latest steps: - name: Checkout code uses: actions/checkout@v3 diff --git a/rust-latest/Dockerfile b/rust-latest/Dockerfile index 8149b4a..049ec17 100644 --- a/rust-latest/Dockerfile +++ b/rust-latest/Dockerfile @@ -7,6 +7,7 @@ FROM rust:1.87 + RUN apt-get update && apt-get install -y sqlite3 # nodejs -- 2.49.1 From 4ff699dd97bf8d7e216f6524121631d5f9f0f85b Mon Sep 17 00:00:00 2001 From: Philipp Hofer Date: Mon, 19 May 2025 17:58:57 +0200 Subject: [PATCH 04/11] ci --- .gitea/workflows/docker-build.yml | 5 ++++- rust-latest/Dockerfile | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/docker-build.yml b/.gitea/workflows/docker-build.yml index eda3cd7..c4d7a4e 100644 --- a/.gitea/workflows/docker-build.yml +++ b/.gitea/workflows/docker-build.yml @@ -8,7 +8,10 @@ on: jobs: build-and-push: runs-on: ubuntu-latest - container: git.hofer.link/philipp/ci-images:rust-latest + container: + image: docker:latest + volumes: + - /var/run/docker.sock:/var/run/docker.sock steps: - name: Checkout code uses: actions/checkout@v3 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 -- 2.49.1 From 26fa8c68564f093caf8668302642ba328fe918b8 Mon Sep 17 00:00:00 2001 From: Philipp Hofer Date: Mon, 19 May 2025 18:01:15 +0200 Subject: [PATCH 05/11] ci --- .gitea/workflows/docker-build.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.gitea/workflows/docker-build.yml b/.gitea/workflows/docker-build.yml index c4d7a4e..658014f 100644 --- a/.gitea/workflows/docker-build.yml +++ b/.gitea/workflows/docker-build.yml @@ -8,10 +8,7 @@ on: jobs: build-and-push: runs-on: ubuntu-latest - container: - image: docker:latest - volumes: - - /var/run/docker.sock:/var/run/docker.sock + container: docker:latest steps: - name: Checkout code uses: actions/checkout@v3 -- 2.49.1 From b4b620b74e775719f1793d8897f6da8431d4903c Mon Sep 17 00:00:00 2001 From: Philipp Hofer Date: Mon, 19 May 2025 18:01:25 +0200 Subject: [PATCH 06/11] ci --- rust-latest/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/rust-latest/Dockerfile b/rust-latest/Dockerfile index 8149b4a..049ec17 100644 --- a/rust-latest/Dockerfile +++ b/rust-latest/Dockerfile @@ -7,6 +7,7 @@ FROM rust:1.87 + RUN apt-get update && apt-get install -y sqlite3 # nodejs -- 2.49.1 From d6e4ece79b5c9b4bcdc119ff4f253cd189c8a40e Mon Sep 17 00:00:00 2001 From: Philipp Hofer Date: Mon, 19 May 2025 18:03:09 +0200 Subject: [PATCH 07/11] 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 -- 2.49.1 From 9e4241aafc37dffb4b816810703913a1a5ba8102 Mon Sep 17 00:00:00 2001 From: Philipp Hofer Date: Mon, 19 May 2025 18:05:30 +0200 Subject: [PATCH 08/11] ci --- .gitea/workflows/docker-build.yml | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/.gitea/workflows/docker-build.yml b/.gitea/workflows/docker-build.yml index 4145f7a..c4f5b7f 100644 --- a/.gitea/workflows/docker-build.yml +++ b/.gitea/workflows/docker-build.yml @@ -13,15 +13,26 @@ jobs: - name: Checkout code uses: actions/checkout@v3 - # Install Docker if not available + + # Install Docker for Debian - name: Install Docker run: | if ! command -v docker &> /dev/null; then - echo "Installing Docker..." + echo "Installing Docker for Debian..." 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 install -y apt-transport-https ca-certificates curl gnupg lsb-release + + # Add Docker's official GPG key + install -m 0755 -d /etc/apt/keyrings + curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg + chmod a+r /etc/apt/keyrings/docker.gpg + + # Add the repository to sources list + echo \ + "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/debian \ + $(lsb_release -cs) stable" | \ + tee /etc/apt/sources.list.d/docker.list > /dev/null + apt-get update apt-get install -y docker-ce docker-ce-cli containerd.io else -- 2.49.1 From e6ed5a38b2246f990af734733450837edcb38658 Mon Sep 17 00:00:00 2001 From: Philipp Hofer Date: Mon, 19 May 2025 18:05:48 +0200 Subject: [PATCH 09/11] push --- rust-latest/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/rust-latest/Dockerfile b/rust-latest/Dockerfile index 8149b4a..049ec17 100644 --- a/rust-latest/Dockerfile +++ b/rust-latest/Dockerfile @@ -7,6 +7,7 @@ FROM rust:1.87 + RUN apt-get update && apt-get install -y sqlite3 # nodejs -- 2.49.1 From 528448b13cbe3acfa70da11b358fc75119ace6b1 Mon Sep 17 00:00:00 2001 From: Philipp Hofer Date: Mon, 19 May 2025 18:12:50 +0200 Subject: [PATCH 10/11] ci --- rust-latest/Dockerfile | 1 - 1 file changed, 1 deletion(-) 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 -- 2.49.1 From c05b658f610e1a6bed5895c3065f14afc527b864 Mon Sep 17 00:00:00 2001 From: Philipp Hofer Date: Mon, 19 May 2025 18:15:14 +0200 Subject: [PATCH 11/11] ci --- .gitea/workflows/docker-build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitea/workflows/docker-build.yml b/.gitea/workflows/docker-build.yml index c4f5b7f..493f8a4 100644 --- a/.gitea/workflows/docker-build.yml +++ b/.gitea/workflows/docker-build.yml @@ -13,7 +13,6 @@ jobs: - name: Checkout code uses: actions/checkout@v3 - # Install Docker for Debian - name: Install Docker run: | -- 2.49.1