From 3e6a3c441e041cafa01f1ce64d6c7de749a4d7a2 Mon Sep 17 00:00:00 2001 From: anima Date: Sat, 25 Jan 2025 09:37:56 +0100 Subject: [PATCH] replace drone ci --- .drone.env.sample | 10 ---------- .git.env.sample | 8 -------- README.md | 44 +++++++++++++++++++++++++++++++++++++++++--- docker-compose.yml | 23 ----------------------- 4 files changed, 41 insertions(+), 44 deletions(-) delete mode 100644 .drone.env.sample delete mode 100644 .git.env.sample diff --git a/.drone.env.sample b/.drone.env.sample deleted file mode 100644 index 166f75d..0000000 --- a/.drone.env.sample +++ /dev/null @@ -1,10 +0,0 @@ -# Drone settings -DRONETAG= - -## https://docs.drone.io/server/provider/gitea/ -DRONE_GITEA_SERVER=https://git.example.com -DRONE_GITEA_CLIENT_ID= -DRONE_GITEA_CLIENT_SECRET= -DRONE_RPC_SECRET= -DRONE_SERVER_HOST=ci.example.com -DRONE_SERVER_PROTO=https \ No newline at end of file diff --git a/.git.env.sample b/.git.env.sample deleted file mode 100644 index 06fc393..0000000 --- a/.git.env.sample +++ /dev/null @@ -1,8 +0,0 @@ -# gitea settings -GITTAG= - -USER_UID=1000 -USER_GID=1000 - -## preconfig for app.ini -## https://github.com/go-gitea/gitea/tree/main/contrib/environment-to-ini \ No newline at end of file diff --git a/README.md b/README.md index 61a41e2..b660fff 100644 --- a/README.md +++ b/README.md @@ -53,8 +53,46 @@ docker service update git_drone --force git.example.com { reverse_proxy git:3000 } +``` -ci.example.com { - reverse_proxy drone:80 -} +## CI Deployment +Since version 1.19.x Gitea has a CI handler integrated. +These CI handler is mostly compatible with Github Actions. + +Runner Setup: https://docs.gitea.com/usage/actions/act-runner +Usage: https://docs.gitea.com/usage/actions/quickstart + +``` +wget -O act_runner https://dl.gitea.com/act_runner/0.2.11/act_runner-0.2.11-linux-amd64 +chmod +x act_runner +./act_runner --version + +./act_runner generate-config > config.yml +# interactive setup +# ./act_runner --config config.yml register + +./act_runner register --no-interactive --instance https://git.your.domain/ --token +# ./act_runner register --no-interactive --instance --token --name --labels + +./act_runner --config config.yml daemon +``` + +Service File +``` +[Unit] +Description=Gitea Actions runner +Documentation=https://gitea.com/gitea/act_runner +After=docker.service + +[Service] +ExecStart=/usr/local/bin/act_runner daemon --config /etc/act_runner/config.yaml +ExecReload=/bin/kill -s HUP $MAINPID +WorkingDirectory=/var/lib/act_runner +TimeoutSec=0 +RestartSec=10 +Restart=always +User=act_runner + +[Install] +WantedBy=multi-user.target ``` \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index fe6ae1d..cd2869f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,7 +6,6 @@ services: image: gitea/gitea:${GITTAG:-latest} container_name: git env_file: - - .git.env - .env restart: unless-stopped ports: @@ -25,28 +24,6 @@ services: networks: - backend - drone: - image: drone/drone:${DRONETAG:-latest} - container_name: drone - env_file: - - .drone.env - - .env - restart: unless-stopped - ports: - - 8080:80 - - 8443:443 - deploy: - replicas: 1 - placement: - max_replicas_per_node: 1 - update_config: - parallelism: 1 - delay: 10s - volumes: - - ${BASEDIR:-.}/files/drone/:/data/ - networks: - - backend - networks: backend: name: ${INTRANET:-backend}