Skip to content

dogfood: upgrade postgres to version 13 #4657

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 20, 2022
Merged

dogfood: upgrade postgres to version 13 #4657

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
195a99b
dogfood: upgrade postgres
ammario Oct 19, 2022
7f9af1d
Fix container updating
ammario Oct 19, 2022
59d2880
Merge remote-tracking branch 'origin/main' into pg13
ammario Oct 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions dogfood/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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 && \
Expand Down
14 changes: 0 additions & 14 deletions dogfood/files/etc/apt/preferences.d/postgresql
View file
Open in desktop

This file was deleted.

22 changes: 12 additions & 10 deletions dogfood/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ terraform {
}
docker = {
source = "kreuzwerker/docker"
version = "~> 2.20.0"
version = "~> 2.22.0"
}
}
}
Expand Down Expand Up @@ -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" {
Expand Down