diff --git a/docker/cf/docker-compose.yml b/docker/cf/docker-compose.yml index eff8747..fdcb560 100644 --- a/docker/cf/docker-compose.yml +++ b/docker/cf/docker-compose.yml @@ -5,6 +5,19 @@ services: image: cloudflare/cloudflared@sha256:119c1712ba89bfb32a404ef6b949284519a99f3de5c1202f483a6800fd1c638e command: tunnel --no-autoupdate run --token $CF_TOKEN + twingate-famous-alligator: + image: twingate/connector@sha256:f5aded82f662144c56c87e4238ea4a20abcc525edc5ad7cdecdac187cf274520 + container_name: twingate-famous-alligator + restart: always + environment: + - TWINGATE_NETWORK=$TWINGATE_NETWORK + - TWINGATE_ACCESS_TOKEN=$TWINGATE_ACCESS_TOKEN + - TWINGATE_REFRESH_TOKEN=$TWINGATE_REFRESH_TOKEN + - TWINGATE_LABEL_HOSTNAME=${HOSTNAME} + - TWINGATE_LABEL_DEPLOYED_BY=docker + sysctls: + - net.ipv4.ping_group_range=0 2147483647 + wallos: container_name: wallos image: bellamy/wallos:2.33.1 diff --git a/docker/docker-runner/docker-compose.yml b/docker/docker-runner/docker-compose.yml deleted file mode 100644 index a2b781e..0000000 --- a/docker/docker-runner/docker-compose.yml +++ /dev/null @@ -1,26 +0,0 @@ ---- -services: - docker-in-docker: - image: docker:dind - container_name: 'docker_dind' - privileged: 'true' - command: ['dockerd', '-H', 'tcp://0.0.0.0:2375', '--tls=false'] - restart: 'unless-stopped' - - gitea: - image: 'code.forgejo.org/forgejo/runner:4.0.1' - links: - - docker-in-docker - depends_on: - docker-in-docker: - condition: service_started - container_name: 'runner' - environment: - DOCKER_HOST: tcp://docker-in-docker:2375 - # User without root privileges, but with access to `/data`. - user: 1000:1000 - volumes: - - /home/mafyuh/data:/data - restart: 'unless-stopped' - - command: '/bin/sh -c "sleep 5; forgejo-runner daemon"' diff --git a/terraform/docker-runner.tf b/terraform/docker-runner.tf deleted file mode 100644 index 8c04f5f..0000000 --- a/terraform/docker-runner.tf +++ /dev/null @@ -1,65 +0,0 @@ -resource "proxmox_virtual_environment_vm" "Docker-Runner" { - - # VM General Settings - node_name = "prox" - vm_id = 209 - name = "docker-runner" - description = "docker-runner for forgejo" - tags = ["tofu", "ubuntu-22", "auto-homelab-repo", "infrastructure"] - - agent { - enabled = true # read 'Qemu guest agent' section, change to true only when ready - } - - clone { - vm_id = 8100 - } - - # VM CPU Settings - cpu { - cores = 2 - type = "host" - architecture = "x86_64" - } - - # VM Memory Settings - memory { - dedicated = 2048 - } - - # VM Network Settings - network_device { - bridge = "vmbr0" - } - - # VM Disk Settings - disk { - datastore_id = "Fast2Tb" - size = 50 - interface = "scsi0" - } - - vga { - type = "serial0" - } - - initialization { - ip_config { - ipv4 { - address = "dhcp" - } - } - - user_data_file_id = proxmox_virtual_environment_file.cloud_config.id -} - - lifecycle { - ignore_changes = [ - initialization[0].user_account[0].keys, - initialization[0].user_account[0].password, - initialization[0].user_account[0].username, - initialization[0].user_data_file_id - ] - } - -} diff --git a/terraform/docker-runner2.tf b/terraform/docker-runner2.tf deleted file mode 100644 index b7fbc0d..0000000 --- a/terraform/docker-runner2.tf +++ /dev/null @@ -1,65 +0,0 @@ -resource "proxmox_virtual_environment_vm" "Docker-Runner2" { - - # VM General Settings - node_name = "prox" - vm_id = 210 - name = "docker-runner2" - description = "docker-runner for forgejo" - tags = ["tofu", "ubuntu-22", "auto-homelab-repo", "infrastructure"] - - agent { - enabled = true # read 'Qemu guest agent' section, change to true only when ready - } - - clone { - vm_id = 8100 - } - - # VM CPU Settings - cpu { - cores = 2 - type = "host" - architecture = "x86_64" - } - - # VM Memory Settings - memory { - dedicated = 2048 - } - - # VM Network Settings - network_device { - bridge = "vmbr0" - } - - # VM Disk Settings - disk { - datastore_id = "Fast2Tb" - size = 50 - interface = "scsi0" - } - - vga { - type = "serial0" - } - - initialization { - ip_config { - ipv4 { - address = "dhcp" - } - } - - user_data_file_id = proxmox_virtual_environment_file.cloud_config.id -} - - lifecycle { - ignore_changes = [ - initialization[0].user_account[0].keys, - initialization[0].user_account[0].password, - initialization[0].user_account[0].username, - initialization[0].user_data_file_id - ] - } - -}