From 195a99be0e66b62821388aff258d831f08653863 Mon Sep 17 00:00:00 2001
From: Ammar Bandukwala <ammar@ammar.io>
Date: Wed, 19 Oct 2022 02:43:45 +0000
Subject: [PATCH 1/2] dogfood: upgrade postgres

---
 dogfood/Dockerfile                             |  6 +++---
 dogfood/files/etc/apt/preferences.d/postgresql | 14 --------------
 2 files changed, 3 insertions(+), 17 deletions(-)
 delete mode 100644 dogfood/files/etc/apt/preferences.d/postgresql

diff --git a/dogfood/Dockerfile b/dogfood/Dockerfile
index 119b3f281b5f1..08a82afee17e3 100644
--- a/dogfood/Dockerfile
+++ b/dogfood/Dockerfile
@@ -147,7 +147,7 @@ RUN apt-get update --quiet && apt-get install --yes \
       google-cloud-sdk \
       google-cloud-sdk-datastore-emulator \
       kubectl \
-      postgresql-11 \
+      postgresql-13 \
       containerd.io \
       docker-ce \
       docker-ce-cli \
@@ -184,8 +184,8 @@ RUN apt-get update && \
     npm i -g playwright@1.19.1 && playwright install-deps
 
 # Ensure PostgreSQL binaries are in the users $PATH.
-RUN update-alternatives --install /usr/local/bin/initdb initdb /usr/lib/postgresql/11/bin/initdb 100 && \
-    update-alternatives --install /usr/local/bin/postgres postgres /usr/lib/postgresql/11/bin/postgres 100
+RUN update-alternatives --install /usr/local/bin/initdb initdb /usr/lib/postgresql/13/bin/initdb 100 && \
+    update-alternatives --install /usr/local/bin/postgres postgres /usr/lib/postgresql/13/bin/postgres 100
 
 # Create links for injected dependencies
 RUN ln --symbolic /var/tmp/coder/coder-cli/coder /usr/local/bin/coder && \
diff --git a/dogfood/files/etc/apt/preferences.d/postgresql b/dogfood/files/etc/apt/preferences.d/postgresql
deleted file mode 100644
index 5d3a76b0694ce..0000000000000
--- a/dogfood/files/etc/apt/preferences.d/postgresql
+++ /dev/null
@@ -1,14 +0,0 @@
-# Ignore all packages from this repository by default
-Package: *
-Pin: origin apt.postgresql.org
-Pin-Priority: 1
-
-# PostgreSQL server for local development
-Package: postgresql-11
-Pin: origin apt.postgresql.org
-Pin-Priority: 500
-
-# PostgreSQL client
-Package: postgresql-client-11
-Pin: origin apt.postgresql.org
-Pin-Priority: 500

From 7f9af1ddb31e2e36c08407c8fca3bc2a4d82bbce Mon Sep 17 00:00:00 2001
From: Ammar Bandukwala <ammar@ammar.io>
Date: Wed, 19 Oct 2022 21:44:18 +0000
Subject: [PATCH 2/2] Fix container updating

---
 dogfood/main.tf | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/dogfood/main.tf b/dogfood/main.tf
index cc65f6b1c6f42..0b757336b812c 100644
--- 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" {