diff --git a/.github/workflows/flake-update.yml b/.github/workflows/flake-update.yml index fbfac81..f959a7b 100644 --- a/.github/workflows/flake-update.yml +++ b/.github/workflows/flake-update.yml @@ -28,13 +28,13 @@ jobs: cache: ${{ secrets.ATTIC_CACHE }} token: ${{ secrets.ATTIC_TOKEN }} - name: Calculate pre-drv - run: nix run git+https://nayeonie.com/ahuston-0/flake-update-diff -- --keep-hydra . + run: nix run git+https://nayeonie.com/ahuston-0/flake-update-diff -- . # - name: Pull latest docker images # run: nix ./utils/fetch-docker.sh - name: Update flake.lock (part 1) run: nix flake update - name: Calculate post-drv - run: nix run git+https://nayeonie.com/ahuston-0/flake-update-diff -- --keep-hydra . + run: nix run git+https://nayeonie.com/ahuston-0/flake-update-diff -- . # - name: Calculate diff # run: nix ./utils/diff-evals.sh # - name: Read diff into environment diff --git a/systems/palatine-hill/docker/act-runner.nix b/systems/palatine-hill/docker/act-runner.nix index f0cfa57..df7b2e1 100644 --- a/systems/palatine-hill/docker/act-runner.nix +++ b/systems/palatine-hill/docker/act-runner.nix @@ -9,7 +9,7 @@ let in { virtualisation.oci-containers.containers = { - act-stable-latest-1 = { + act-stable-latest-main = { image = "gitea/act_runner:latest"; extraOptions = [ "--stop-signal=SIGINT" @@ -19,6 +19,28 @@ in "com.centurylinklabs.watchtower.scope" = "act-runner"; }; ports = [ "8088:8088" ]; + volumes = [ + "${act_path}/stable-latest-main/config.yaml:/config.yaml" + "${act_path}/stable-latest-main/data:/data" + "/var/run/docker.sock:/var/run/docker.sock" + ]; + environment = { + CONFIG_FILE = "/config.yaml"; + GITEA_RUNNER_NAME = "stable-latest-main"; + }; + environmentFiles = [ config.sops.secrets."docker/act-runner".path ]; + log-driver = "local"; + }; + + act-stable-latest-1 = { + image = "gitea/act_runner:latest"; + extraOptions = [ + "--stop-signal=SIGINT" + ]; + labels = { + "com.centurylinklabs.watchtower.enable" = "true"; + "com.centurylinklabs.watchtower.scope" = "act-runner"; + }; volumes = [ "${act_path}/stable-latest-1/config.yaml:/config.yaml" "${act_path}/stable-latest-1/data:/data" @@ -41,7 +63,7 @@ in "com.centurylinklabs.watchtower.enable" = "true"; "com.centurylinklabs.watchtower.scope" = "act-runner"; }; - # ports = [ "8088:8088" ]; + ports = [ "8088:8088" ]; volumes = [ "${act_path}/stable-latest-2/config.yaml:/config.yaml" "${act_path}/stable-latest-2/data:/data" @@ -77,6 +99,52 @@ in environmentFiles = [ config.sops.secrets."docker/act-runner".path ]; log-driver = "local"; }; + + act-stable-latest-4 = { + image = "gitea/act_runner:latest"; + extraOptions = [ + "--stop-signal=SIGINT" + ]; + labels = { + "com.centurylinklabs.watchtower.enable" = "true"; + "com.centurylinklabs.watchtower.scope" = "act-runner"; + }; + # ports = [ "8088:8088" ]; + volumes = [ + "${act_path}/stable-latest-4/config.yaml:/config.yaml" + "${act_path}/stable-latest-4/data:/data" + "/var/run/docker.sock:/var/run/docker.sock" + ]; + environment = { + CONFIG_FILE = "/config.yaml"; + GITEA_RUNNER_NAME = "stable-latest-4"; + }; + environmentFiles = [ config.sops.secrets."docker/act-runner".path ]; + log-driver = "local"; + }; + + act-stable-latest-5 = { + image = "gitea/act_runner:latest"; + extraOptions = [ + "--stop-signal=SIGINT" + ]; + labels = { + "com.centurylinklabs.watchtower.enable" = "true"; + "com.centurylinklabs.watchtower.scope" = "act-runner"; + }; + # ports = [ "8088:8088" ]; + volumes = [ + "${act_path}/stable-latest-5/config.yaml:/config.yaml" + "${act_path}/stable-latest-5/data:/data" + "/var/run/docker.sock:/var/run/docker.sock" + ]; + environment = { + CONFIG_FILE = "/config.yaml"; + GITEA_RUNNER_NAME = "stable-latest-5"; + }; + environmentFiles = [ config.sops.secrets."docker/act-runner".path ]; + log-driver = "local"; + }; }; systemd = {