Skip to content
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.

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

chore(deps): Upgrade base Alpine from 3.19 to 3.20 #55

Merged
merged 1 commit into from
Jul 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 6 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
@@ -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].
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions build/pgtap/Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion build/pgtap/versions.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"defaults": {
"alpine": "3.19"
"alpine": "3.20"
},
"postgres": [
{
Expand Down
2 changes: 1 addition & 1 deletion package-versions.json
Original file line number Diff line number Diff line change
@@ -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"}