summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTrygve Laugstøl <trygvis@inamo.no>2022-12-26 18:31:31 +0100
committerTrygve Laugstøl <trygvis@inamo.no>2022-12-26 18:31:31 +0100
commitfa5b7239263736cb2d0e63a4342fc825165ccdcd (patch)
tree4943d6549cfc9713b6265c471176fda3d20dd27c
parentfdf38928edd187949c8f4fc5a60b9780500d3e2e (diff)
downloadinfra-fa5b7239263736cb2d0e63a4342fc825165ccdcd.tar.gz
infra-fa5b7239263736cb2d0e63a4342fc825165ccdcd.tar.bz2
infra-fa5b7239263736cb2d0e63a4342fc825165ccdcd.tar.xz
infra-fa5b7239263736cb2d0e63a4342fc825165ccdcd.zip
concourse
-rw-r--r--terraform/concourse/concourse.tf12
-rw-r--r--terraform/conflatorio-docker/traefik.tf11
2 files changed, 19 insertions, 4 deletions
diff --git a/terraform/concourse/concourse.tf b/terraform/concourse/concourse.tf
index c386e91..fc5e526 100644
--- a/terraform/concourse/concourse.tf
+++ b/terraform/concourse/concourse.tf
@@ -2,12 +2,16 @@ data "docker_network" "traefik" {
name = "traefik"
}
-resource "docker_image" "concourse" {
- name = "concourse/concourse:7.8.3"
+data "docker_network" "bridge" {
+ name = "bridge"
+}
+
+resource "docker_image" "concourse-7_9_0" {
+ name = "concourse/concourse:7.9.0"
}
resource "docker_container" "concourse" {
- image = docker_image.concourse.image_id
+ image = docker_image.concourse-7_9_0.image_id
name = "concourse"
privileged = true
must_run = false
@@ -19,7 +23,7 @@ resource "docker_container" "concourse" {
}
networks_advanced {
- name = "bridge"
+ name = data.docker_network.bridge.name
}
ports {
diff --git a/terraform/conflatorio-docker/traefik.tf b/terraform/conflatorio-docker/traefik.tf
index 83adac3..46d4671 100644
--- a/terraform/conflatorio-docker/traefik.tf
+++ b/terraform/conflatorio-docker/traefik.tf
@@ -1,5 +1,16 @@
resource "docker_network" "traefik" {
name = "traefik"
+# ipv6 = true
+
+ ipam_config {
+ gateway = "172.20.0.1"
+ subnet = "172.20.0.0/16"
+ }
+
+# ipam_config {
+# subnet = "fd00:dead:beef::/48"
+# gateway = "fd00:dead:beef::1"
+# }
}
resource "docker_image" "traefik" {