From 8ea0d1e2e6dddd41b9020041e62612e07b21c08a Mon Sep 17 00:00:00 2001
From: Austin Ziegler <aziegler@kineticcommerce.com>
Date: Sun, 14 Jul 2024 00:03:28 -0400
Subject: [PATCH] chore(deps): Upgrade base Alpine from 3.19 to 3.20

---
 Changelog.md              |  6 ++++++
 Dockerfile                |  2 +-
 build/pgtap/Dockerfile    | 12 ++++++------
 build/pgtap/versions.json |  2 +-
 package-versions.json     |  2 +-
 5 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index f0d7767..f5559e8 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,5 +1,9 @@
 # kineticcafe/sqitch-pgtap Changelog
 
+## 2.8.0 / 2024-07-17
+
+- Upgrade Alpine to version [3.20][alpine-3.20].
+
 ## 2.7.0 / 2024-04-24
 
 - Upgrade pgTAP to released version [1.3.3][pgtap-1.3.3].
@@ -43,6 +47,7 @@
 
   - Add the version of Alpine to `package-versions.json` and use that for image
     builds.
+
   - Change maintenance procedure to automatically generate the
     `build/pgtap/Dockerfile`. The latest versions required some updates because
     of CLANG and LLVM version mismatches.
@@ -192,6 +197,7 @@
 [alpine-3.17]: https://hub.docker.com/_/alpine/tags?name=3.17
 [alpine-3.18]: https://hub.docker.com/_/alpine/tags?name=3.18
 [alpine-3.19]: https://hub.docker.com/_/alpine/tags?name=3.19
+[alpine-3.20]: https://hub.docker.com/_/alpine/tags?name=3.20
 [casey/just]: https://github.com/casey/just
 [extractions/setup-just]: https://github.com/extractions/setup-just
 [orbstack-internal]: https://docs.orbstack.dev/machines/network#connecting-to-servers-on-mac
diff --git a/Dockerfile b/Dockerfile
index a021807..6d9afeb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -63,7 +63,7 @@ echo $__DOCKERFILE_VERSION__ > /home/sqitch/VERSION
 echo $__DOCKERFILE_DATE__ > /home/sqitch/DATE
 
 chmod +x /home/sqitch/bin/*
-chown -R sqitch:sqitch /home
+chown -R sqitch:sqitch /home/sqitch
 FINALIZE
 
 ENV LESS=-R LC_ALL=C.UTF-8 LANG=C.UTF-8 SQITCH_EDITOR=nano SQITCH_PAGER=less
diff --git a/build/pgtap/Dockerfile b/build/pgtap/Dockerfile
index 4f1d9bc..f8e77cb 100644
--- a/build/pgtap/Dockerfile
+++ b/build/pgtap/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM postgres:16-alpine3.19 AS build-pgtap-psql-16
+FROM postgres:16-alpine3.20 AS build-pgtap-psql-16
 
 ARG PGTAP_VERSION
 
@@ -46,7 +46,7 @@ mv sql/pgtap.sql sql/uninstall_pgtap.sql /opt/pgtap/16
 BUILD
 
 
-FROM postgres:15-alpine3.19 AS build-pgtap-psql-15
+FROM postgres:15-alpine3.20 AS build-pgtap-psql-15
 
 ARG PGTAP_VERSION
 
@@ -92,7 +92,7 @@ mv sql/pgtap.sql sql/uninstall_pgtap.sql /opt/pgtap/15
 BUILD
 
 
-FROM postgres:14-alpine3.19 AS build-pgtap-psql-14
+FROM postgres:14-alpine3.20 AS build-pgtap-psql-14
 
 ARG PGTAP_VERSION
 
@@ -138,7 +138,7 @@ mv sql/pgtap.sql sql/uninstall_pgtap.sql /opt/pgtap/14
 BUILD
 
 
-FROM postgres:13-alpine3.19 AS build-pgtap-psql-13
+FROM postgres:13-alpine3.20 AS build-pgtap-psql-13
 
 ARG PGTAP_VERSION
 
@@ -184,7 +184,7 @@ mv sql/pgtap.sql sql/uninstall_pgtap.sql /opt/pgtap/13
 BUILD
 
 
-FROM postgres:12-alpine3.19 AS build-pgtap-psql-12
+FROM postgres:12-alpine3.20 AS build-pgtap-psql-12
 
 ARG PGTAP_VERSION
 
@@ -368,7 +368,7 @@ mv sql/pgtap.sql sql/uninstall_pgtap.sql /opt/pgtap/9.6
 BUILD
 
 
-FROM alpine:3.19 AS package-pgtap
+FROM alpine:3.20 AS package-pgtap
 
 RUN mkdir -p /opt/pgtap
 
diff --git a/build/pgtap/versions.json b/build/pgtap/versions.json
index 7e66c7f..4dce648 100644
--- a/build/pgtap/versions.json
+++ b/build/pgtap/versions.json
@@ -1,6 +1,6 @@
 {
   "defaults": {
-    "alpine": "3.19"
+    "alpine": "3.20"
   },
   "postgres": [
     {
diff --git a/package-versions.json b/package-versions.json
index f755806..73f1a08 100644
--- a/package-versions.json
+++ b/package-versions.json
@@ -1 +1 @@
-{"alpine":{"version":"3.19"},"pg_prove":{"version":"3.36"},"pgtap":{"version":"1.3.3"},"sqitch":{"version":"1.4.1"},"VERSION":"2.7.0","DATE":"2024-04-22"}
+{"alpine":{"version":"3.20"},"pg_prove":{"version":"3.36"},"pgtap":{"version":"1.3.3"},"sqitch":{"version":"1.4.1"},"VERSION":"2.8.0","DATE":"2024-07-14"}