6 files changed, 5 insertions, 116 deletions
diff --git a/terraform/conflatorio-docker/.terraform.lock.hcl b/terraform/conflatorio-docker/.terraform.lock.hcl
deleted file mode 100644
index aa0f1fb..0000000
--- a/terraform/conflatorio-docker/.terraform.lock.hcl
+++ /dev/null
@@ -1,62 +0,0 @@
-# This file is maintained automatically by "terraform init".
-# Manual edits may be lost in future updates.
-
-provider "registry.terraform.io/hashicorp/null" {
-  version = "3.2.1"
-  hashes = [
-    "h1:FbGfc+muBsC17Ohy5g806iuI1hQc4SIexpYCrQHQd8w=",
-    "zh:58ed64389620cc7b82f01332e27723856422820cfd302e304b5f6c3436fb9840",
-    "zh:62a5cc82c3b2ddef7ef3a6f2fedb7b9b3deff4ab7b414938b08e51d6e8be87cb",
-    "zh:63cff4de03af983175a7e37e52d4bd89d990be256b16b5c7f919aff5ad485aa5",
-    "zh:74cb22c6700e48486b7cabefa10b33b801dfcab56f1a6ac9b6624531f3d36ea3",
-    "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3",
-    "zh:79e553aff77f1cfa9012a2218b8238dd672ea5e1b2924775ac9ac24d2a75c238",
-    "zh:a1e06ddda0b5ac48f7e7c7d59e1ab5a4073bbcf876c73c0299e4610ed53859dc",
-    "zh:c37a97090f1a82222925d45d84483b2aa702ef7ab66532af6cbcfb567818b970",
-    "zh:e4453fbebf90c53ca3323a92e7ca0f9961427d2f0ce0d2b65523cc04d5d999c2",
-    "zh:e80a746921946d8b6761e77305b752ad188da60688cfd2059322875d363be5f5",
-    "zh:fbdb892d9822ed0e4cb60f2fedbdbb556e4da0d88d3b942ae963ed6ff091e48f",
-    "zh:fca01a623d90d0cad0843102f9b8b9fe0d3ff8244593bd817f126582b52dd694",
-  ]
-}
-
-provider "registry.terraform.io/kreuzwerker/docker" {
-  version     = "2.24.0"
-  constraints = "2.24.0"
-  hashes = [
-    "h1:1z0/qA77T3PS/1m4vRO8UgWjHjk5/v+f3JfGbMyzX18=",
-    "zh:181fefd55c8eb75efe9815c43fdd76422b57951ef53b5d5f19273a00fdf0e2e2",
-    "zh:2ec84e029d169f188be2addf7f45c2555f226f67d4b6fb66c1749ed5b2c4a76a",
-    "zh:6f5cf945148485f57b919d31a30f1a5a93d45f4e8edfdb0b80b22258d51795d8",
-    "zh:8d00c2c459a48453f52a00a8d1ffdb7bcf72fe4b3b09ffcfd52218c4646fa7fa",
-    "zh:9bd6e06601e0a972b9ce01150e32e76b76b4caf1d9798daf4cf16d06e2a8d4a3",
-    "zh:af72591132dc8cd338f293e458403851e6b8a6ac4c4d25a3268940f9763df7aa",
-    "zh:c4a47c5c7ad2ff1fc5212e69c5ef837a127346264e46ce7b5d13362545e4aa70",
-    "zh:c6d68f33efcd3372331ed0d58ec49e8b01ddc132934b14d2d45977076950e4b3",
-    "zh:db228855ae7235095d367f3597719747e5be0dd9ce2206ea02062560b518c08a",
-    "zh:e8d6ce89642925f2e813d0b829bd5562582de37eaa39351e231ab474383e703a",
-    "zh:ec83d8c86a918d25eb824cc99f98924ef8949eb69aa40cb5ff2db24369e52d9c",
-    "zh:ee0032d3d86adeeca7fdd4922bb8db87dbb5cd0093c054ff8efe2260de0b624c",
-    "zh:f033b70f342f32eeb98c213e6fc7098d7afd22b3146a5cb6173c128b0e86d732",
-    "zh:f1bc3a2c4f152f8adc9a1f9c852496232ef31073b149945756c13bc9688cf08b",
-  ]
-}
-
-provider "registry.terraform.io/lokkersp/sops" {
-  version     = "0.6.10"
-  constraints = "0.6.10"
-  hashes = [
-    "h1:atU8NIBxpNTWY+qBubvEOfjOn4K1aCDoq1iUFocgIHQ=",
-    "zh:0f053a26392a581b1f1ce6316cb7ed8ec4cc75e7f5f1cf7cfd45050b6b3c87ea",
-    "zh:207bb96c4471fce9aeb1b3c217d772692c3d865d294cf4d2501dad41de36a15e",
-    "zh:28506e8f1f3b9eaa95d99043440328044ee6340143535e5751538328a529d001",
-    "zh:3cae3bcea9e35fdc5b3f2af1b4580cd625c996448ad0c676c772260e46b25289",
-    "zh:3e44daaf82986c2b0028aeb17b867f3c68ed5dd8ac8625ba0406cf2a5fd3d92e",
-    "zh:457fb8ca2e677af24f9a4bdd8b613b1d7b604ad7133541657e5757c19268da71",
-    "zh:473d727c228f021a3df8cc8dcc6231ad7f90ed63f9e47c36b597d591e76228da",
-    "zh:48c4c1df39fd76ec8bd5fe9ac70cdc0927ac8be95582dbe46458b3442ce0fcd9",
-    "zh:728b19cb5c07e5e9d8b78fd94cc57d4c13582ecd24b7eb7c4cc2bf73b12fe4d1",
-    "zh:c51ed9af591779bb0910b82addeebb10f53428b994f8db653dd1dedcec60916c",
-    "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c",
-  ]
-}
diff --git a/terraform/conflatorio-docker/backend.tf b/terraform/conflatorio-docker/backend.tf
deleted file mode 100644
index d2de289..0000000
--- a/terraform/conflatorio-docker/backend.tf
+++ /dev/null
@@ -1,12 +0,0 @@
-# Generated by Terragrunt. Sig: nIlQXj57tbuaRZEa
-terraform {
-  backend "s3" {
-    bucket                      = "terraform-a6726272-73ff-11ed-8bdd-c79eb8376e05"
-    key                         = "conflatorio-docker/terraform.tfstate"
-    skip_region_validation      = true
-    skip_credentials_validation = true
-    skip_metadata_api_check     = true
-    region                      = "eu-central-1"
-    endpoint                    = "eu-central-1.linodeobjects.com"
-  }
-}
diff --git a/terraform/conflatorio-docker/main.tf b/terraform/conflatorio-docker/main.tf
deleted file mode 100644
index 8a01be6..0000000
--- a/terraform/conflatorio-docker/main.tf
+++ /dev/null
@@ -1,27 +0,0 @@
-terraform {
-  required_version = "~> 1.3.5"
-
-  required_providers {
-    docker = {
-      source  = "kreuzwerker/docker"
-      version = "2.24.0"
-    }
-    sops = {
-      source  = "lokkersp/sops"
-      version = "0.6.10"
-    }
-  }
-}
-
-provider "docker" {
-  host = "ssh://conflatorio.vpn.trygvis.io"
-}
-
-data "sops_file_entry" "linode_token" {
-  source_file = "../../sops.yml"
-  data_key    = "linode_token"
-}
-
-output "foo" {
-  value = "foo!"
-}
diff --git a/terraform/conflatorio-docker/network.tf b/terraform/conflatorio-docker/network.tf
deleted file mode 100644
index 32e1bfb..0000000
--- a/terraform/conflatorio-docker/network.tf
+++ /dev/null
@@ -1,9 +0,0 @@
-resource "docker_network" "public" {
-  name = "public"
-
-  ipv6 = true
-
-  ipam_config {
-    subnet  = "fdf3:aad9:a885:77dd:bbbb::/120"
-  }
-}
diff --git a/terraform/conflatorio-docker/terragrunt.hcl b/terraform/conflatorio-docker/terragrunt.hcl
deleted file mode 100644
index e147285..0000000
--- a/terraform/conflatorio-docker/terragrunt.hcl
+++ /dev/null
@@ -1,3 +0,0 @@
-include "root" {
-  path = find_in_parent_folders()
-}
diff --git a/terraform/conflatorio-docker/traefik.tf b/terraform/conflatorio-docker/traefik.tf
index d15ac5c..cb5f2a0 100644
--- a/terraform/conflatorio-docker/traefik.tf
+++ b/terraform/conflatorio-docker/traefik.tf
@@ -12,6 +12,8 @@ resource "docker_container" "traefik" {
   privileged = false
   must_run   = false
 
+  network_mode = "bridge"
+
   networks_advanced {
     name = docker_network.traefik.name
   }
@@ -23,20 +25,20 @@ resource "docker_container" "traefik" {
   ports {
     internal = 80
     external = 80
-    ip       = "fdf3:aad9:a885:77dd::2"
+    ip       = "${local.public_ip}"
   }
 
   ports {
     internal = 443
     external = 443
-    ip       = "fdf3:aad9:a885:77dd::2"
+    ip       = "${local.public_ip}"
   }
 
   # for buildfarm-server
   ports {
     internal = 8980
     external = 8980
-    ip       = "fdf3:aad9:a885:77dd::2"
+    ip       = "${local.public_ip}"
   }
 
   command = [