From 9616cbb61a1783abc956eb542d8e29714f89fb1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9l=C3=A8ne=20Martin?= Date: Fri, 8 Dec 2023 10:58:20 -0800 Subject: [PATCH 1/2] Upgrade postgres to 14.10 in dev container setup --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 528ac35bf..5cc76666e 100644 --- a/Makefile +++ b/Makefile @@ -88,7 +88,7 @@ lint: node_version .PHONY: run-docker-postgres run-docker-postgres: stop-docker-postgres - docker start odk-postgres14 || (docker run -d --name odk-postgres14 -p 5432:5432 -e POSTGRES_PASSWORD=odktest postgres:14.6 && sleep 5 && node lib/bin/create-docker-databases.js) + docker start odk-postgres14 || (docker run -d --name odk-postgres14 -p 5432:5432 -e POSTGRES_PASSWORD=odktest postgres:14.10 && sleep 5 && node lib/bin/create-docker-databases.js) .PHONY: stop-docker-postgres stop-docker-postgres: @@ -105,4 +105,4 @@ check-file-headers: .PHONY: api-docs api-docs: (test "$(docker images -q odk-docs)" || docker build --file odk-docs.dockerfile -t odk-docs .) && \ - docker run --rm -it -v ./docs:/docs/docs/_static/central-spec -p 8000:8000 odk-docs \ No newline at end of file + docker run --rm -it -v ./docs:/docs/docs/_static/central-spec -p 8000:8000 odk-docs From 86536d37b6412ef9d809e6284b071dfee024f691 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9l=C3=A8ne=20Martin?= Date: Fri, 8 Dec 2023 13:38:39 -0800 Subject: [PATCH 2/2] Use alpine image --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 5cc76666e..4e81d288c 100644 --- a/Makefile +++ b/Makefile @@ -88,7 +88,7 @@ lint: node_version .PHONY: run-docker-postgres run-docker-postgres: stop-docker-postgres - docker start odk-postgres14 || (docker run -d --name odk-postgres14 -p 5432:5432 -e POSTGRES_PASSWORD=odktest postgres:14.10 && sleep 5 && node lib/bin/create-docker-databases.js) + docker start odk-postgres14 || (docker run -d --name odk-postgres14 -p 5432:5432 -e POSTGRES_PASSWORD=odktest postgres:14.10-alpine && sleep 5 && node lib/bin/create-docker-databases.js) .PHONY: stop-docker-postgres stop-docker-postgres: