diff --git a/.gitignore b/.gitignore index 83f629c..d3bf068 100644 --- a/.gitignore +++ b/.gitignore @@ -9,8 +9,6 @@ backend/token/ gitea/config/app.ini gitea/data/* -gitea-runner/data/* - # Rust build artifacts **/target/ diff --git a/docker-compose.yml b/docker-compose.yml index 90b6696..48eb77b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -177,25 +177,6 @@ services: - SYMFONY__ENV__DATABASE_USER=${POSTGRES_USER} - SYMFONY__ENV__DATABASE_PASSWORD=${POSTGRES_PASSWORD} - gitea-runner: - build: - context: ./gitea-runner - dockerfile: Dockerfile - container_name: "${GITEA_RUNNER_HOST}" - environment: - GITEA_RUNNER_NAME: ${GITEA_RUNNER_NAME} - CONFIG_FILE: /config.yaml - GITEA_RUNNER_REGISTRATION_TOKEN: ${GITEA_RUNNER_REGISTRATION_TOKEN} - GITEA_INSTANCE_URL: "http://${GITEA_HOST}:3000" - GITEA_RUNNER_LABELS: "self-hosted:host" - volumes: - - ./gitea-runner/config.yaml:/config.yaml - - ./gitea-runner/data:/data - - /var/run/docker.sock:/var/run/docker.sock # WARNING: Docker socket mount gives container host-level access. Runner is in 'disabled' profile to mitigate risk. - - /home/adamf/deploy/web_server:/home/adamf/deploy/web_server # Same path on host and container so docker compose bind mounts resolve correctly - restart: unless-stopped - networks: - - app-network gitea: image: docker.gitea.com/gitea:1.25.4-rootless diff --git a/gitea-runner/Dockerfile b/gitea-runner/Dockerfile deleted file mode 100644 index 21998e4..0000000 --- a/gitea-runner/Dockerfile +++ /dev/null @@ -1,3 +0,0 @@ -FROM gitea/act_runner:latest - -RUN apk add --no-cache docker-cli docker-cli-compose diff --git a/gitea-runner/config.yaml b/gitea-runner/config.yaml deleted file mode 100644 index d42fa85..0000000 --- a/gitea-runner/config.yaml +++ /dev/null @@ -1,112 +0,0 @@ -# Example configuration file, it's safe to copy this as the default config file without any modification. - -# You don't have to copy this file to your instance, -# just run `./act_runner generate-config > config.yaml` to generate a config file. - -log: - # The level of logging, can be trace, debug, info, warn, error, fatal - level: info - -runner: - # Where to store the registration result. - file: .runner - # Execute how many tasks concurrently at the same time. - capacity: 1 - # Extra environment variables to run jobs. - envs: - A_TEST_ENV_NAME_1: a_test_env_value_1 - A_TEST_ENV_NAME_2: a_test_env_value_2 - # Extra environment variables to run jobs from a file. - # It will be ignored if it's empty or the file doesn't exist. - env_file: .env - # The timeout for a job to be finished. - # Please note that the Gitea instance also has a timeout (3h by default) for the job. - # So the job could be stopped by the Gitea instance if it's timeout is shorter than this. - timeout: 3h - # The timeout for the runner to wait for running jobs to finish when shutting down. - # Any running jobs that haven't finished after this timeout will be cancelled. - shutdown_timeout: 0s - # Whether skip verifying the TLS certificate of the Gitea instance. - insecure: false - # The timeout for fetching the job from the Gitea instance. - fetch_timeout: 5s - # The interval for fetching the job from the Gitea instance. - fetch_interval: 2s - # The github_mirror of a runner is used to specify the mirror address of the github that pulls the action repository. - # It works when something like `uses: actions/checkout@v4` is used and DEFAULT_ACTIONS_URL is set to github, - # and github_mirror is not empty. In this case, - # it replaces https://github.com with the value here, which is useful for some special network environments. - github_mirror: "" - # The labels of a runner are used to determine which jobs the runner can run, and how to run them. - # Like: "macos-arm64:host" or "ubuntu-latest:docker://docker.gitea.com/runner-images:ubuntu-latest" - # Find more images provided by Gitea at https://gitea.com/docker.gitea.com/runner-images . - # If it's empty when registering, it will ask for inputting labels. - # If it's empty when execute `daemon`, will use labels in `.runner` file. - labels: - - "self-hosted:host" - - "ubuntu-latest:docker://docker.gitea.com/runner-images:ubuntu-latest" - - "ubuntu-22.04:docker://docker.gitea.com/runner-images:ubuntu-22.04" - - "ubuntu-20.04:docker://docker.gitea.com/runner-images:ubuntu-20.04" - -cache: - # Enable cache server to use actions/cache. - enabled: true - # The directory to store the cache data. - # If it's empty, the cache data will be stored in $HOME/.cache/actcache. - dir: "" - # The host of the cache server. - # It's not for the address to listen, but the address to connect from job containers. - # So 0.0.0.0 is a bad choice, leave it empty to detect automatically. - host: "" - # The port of the cache server. - # 0 means to use a random available port. - port: 0 - # The external cache server URL. Valid only when enable is true. - # If it's specified, act_runner will use this URL as the ACTIONS_CACHE_URL rather than start a server by itself. - # The URL should generally end with "/". - external_server: "" - -container: - # Specifies the network to which the container will connect. - # Could be host, bridge or the name of a custom network. - # If it's empty, act_runner will create a network automatically. - network: "" - # Whether to use privileged mode or not when launching task containers (privileged mode is required for Docker-in-Docker). - privileged: false - # And other options to be used when the container is started (eg, --add-host=my.gitea.url:host-gateway). - options: - # The parent directory of a job's working directory. - # NOTE: There is no need to add the first '/' of the path as act_runner will add it automatically. - # If the path starts with '/', the '/' will be trimmed. - # For example, if the parent directory is /path/to/my/dir, workdir_parent should be path/to/my/dir - # If it's empty, /workspace will be used. - workdir_parent: - # Volumes (including bind mounts) can be mounted to containers. Glob syntax is supported, see https://github.com/gobwas/glob - # You can specify multiple volumes. If the sequence is empty, no volumes can be mounted. - # For example, if you only allow containers to mount the `data` volume and all the json files in `/src`, you should change the config to: - # valid_volumes: - # - data - # - /src/*.json - # If you want to allow any volume, please use the following configuration: - # valid_volumes: - # - '**' - valid_volumes: - - "**" - # overrides the docker client host with the specified one. - # If it's empty, act_runner will find an available docker host automatically. - # If it's "-", act_runner will find an available docker host automatically, but the docker host won't be mounted to the job containers and service containers. - # If it's not empty or "-", the specified docker host will be used. An error will be returned if it doesn't work. - docker_host: "" - # Pull docker image(s) even if already present - force_pull: true - # Rebuild docker image(s) even if already present - force_rebuild: false - # Always require a reachable docker daemon, even if not required by act_runner - require_docker: false - # Timeout to wait for the docker daemon to be reachable, if docker is required by require_docker or act_runner - docker_timeout: 0s - -host: - # The parent directory of a job's working directory. - # If it's empty, $HOME/.cache/act/ will be used. - workdir_parent: diff --git a/readme.md b/readme.md index 58f91a7..b4bf257 100644 --- a/readme.md +++ b/readme.md @@ -21,7 +21,6 @@ backend (8080) ── Go API db (5432) ── PostgreSQL 16 icecast2 (8000) ── Audio Streaming gitea (3000) ── Self-Hosted Git -gitea-runner ── CI/CD Runner certbot ── SSL Certificate Management ``` @@ -107,9 +106,6 @@ GITEA_HOST= GITEA_PORT= POSTGRES_GITEA_DB= -GITEA_RUNNER_HOST= -GITEA_RUNNER_NAME= -GITEA_RUNNER_REGISTRATION_TOKEN= BACKEND_PORT= BACKEND_HOST=