dogfood: upgrade postgres to version 13 (#4657)

ammario · web-flow · commit 63602bf56887 · 2022-10-20T03:06:57.000Z
* Fix container updating
diff --git a/dogfood/main.tf b/dogfood/main.tf
@@ -6,7 +6,7 @@ terraform {
     }
     docker = {
       source  = "kreuzwerker/docker"
-      version = "~> 2.20.0"
+      version = "~> 2.22.0"
     }
   }
 }
@@ -65,20 +65,22 @@ resource "coder_metadata" "home_info" {
   }
 }
 
-
-data "docker_registry_image" "dogfood" {
-  name = "codercom/oss-dogfood:main"
-}
-
-
 locals {
   container_name = "coder-${data.coder_workspace.me.owner}-${lower(data.coder_workspace.me.name)}"
+  registry_name  = "codercom/oss-dogfood"
+}
+data "docker_registry_image" "dogfood" {
+  name = "${local.registry_name}:main"
 }
 
 resource "docker_image" "dogfood" {
-  name          = data.docker_registry_image.dogfood.name
-  pull_triggers = [data.docker_registry_image.dogfood.sha256_digest]
-  keep_locally  = true
+  name = "${local.registry_name}@${data.docker_registry_image.dogfood.sha256_digest}"
+  pull_triggers = [
+    data.docker_registry_image.dogfood.sha256_digest,
+    sha1(join("", [for f in fileset(path.module, "files/*") : filesha1(f)])),
+    filesha1("Dockerfile"),
+  ]
+  keep_locally = true
 }
 
 resource "docker_container" "workspace" {

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ terraform {`
`6`	`6`	`}`
`7`	`7`	`docker = {`
`8`	`8`	`source = "kreuzwerker/docker"`
`9`		`- version = "~> 2.20.0"`
	`9`	`+ version = "~> 2.22.0"`
`10`	`10`	`}`
`11`	`11`	`}`
`12`	`12`	`}`
`@@ -65,20 +65,22 @@ resource "coder_metadata" "home_info" {`
`65`	`65`	`}`
`66`	`66`	`}`
`67`	`67`
`68`		`-`
`69`		`-data "docker_registry_image" "dogfood" {`
`70`		`- name = "codercom/oss-dogfood:main"`
`71`		`-}`
`72`		`-`
`73`		`-`
`74`	`68`	`locals {`
`75`	`69`	`container_name = "coder-${data.coder_workspace.me.owner}-${lower(data.coder_workspace.me.name)}"`
	`70`	`+ registry_name = "codercom/oss-dogfood"`
	`71`	`+}`
	`72`	`+data "docker_registry_image" "dogfood" {`
	`73`	`+ name = "${local.registry_name}:main"`
`76`	`74`	`}`
`77`	`75`
`78`	`76`	`resource "docker_image" "dogfood" {`
`79`		`- name = data.docker_registry_image.dogfood.name`
`80`		`- pull_triggers = [data.docker_registry_image.dogfood.sha256_digest]`
`81`		`- keep_locally = true`
	`77`	`+ name = "${local.registry_name}@${data.docker_registry_image.dogfood.sha256_digest}"`
	`78`	`+ pull_triggers = [`
	`79`	`+ data.docker_registry_image.dogfood.sha256_digest,`
	`80`	`+ sha1(join("", [for f in fileset(path.module, "files/*") : filesha1(f)])),`
	`81`	`+ filesha1("Dockerfile"),`
	`82`	`+ ]`
	`83`	`+ keep_locally = true`
`82`	`84`	`}`
`83`	`85`
`84`	`86`	`resource "docker_container" "workspace" {`