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.

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

Improve Renovate configuration #72

Merged
merged 4 commits into from
Dec 14, 2024
Merged

Improve Renovate configuration #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a4b42d9
Use Homebrew as source for Postgres updates
andyundso Dec 9, 2024
55cfead
Track Alpine version with Renovate
andyundso Dec 9, 2024
321d0e9
Also update Alpine version mentioned on CI
andyundso Dec 9, 2024
09535f3
`env` is not available for a `matrix`
andyundso Dec 13, 2024
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
9 changes: 5 additions & 4 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,14 @@ jobs:
type=registry,ref=pgautoupgrade/pgautoupgrade:build-15-${{ matrix.operating_system.flavor }}
type=registry,ref=pgautoupgrade/pgautoupgrade:build-16-${{ matrix.operating_system.flavor }}
type=registry,ref=pgautoupgrade/pgautoupgrade:${{ matrix.pg_target }}-${{ matrix.operating_system.flavor }}
type=registry,ref=pgautoupgrade/pgautoupgrade:${{ matrix.pg_target }}-${{ matrix.operating_system.flavor }}${{ matrix.operating_system.version }}
type=registry,ref=pgautoupgrade/pgautoupgrade:${{ matrix.pg_target }}-${{ matrix.operating_system.flavor }}${{ matrix.operating_system.OS_VERSION }}

strategy:
matrix:
operating_system:
- flavor: "alpine"
version: "3.20"
# renovate: datasource=docker depName=alpine versioning=docker
OS_VERSION: "3.20"
- flavor: "bookworm"
pg_target:
- "12"
Expand Down Expand Up @@ -112,7 +113,7 @@ jobs:
load: true
tags: |
"pgautoupgrade/pgautoupgrade:${{ matrix.pg_target }}-${{ matrix.operating_system.flavor }}"
"pgautoupgrade/pgautoupgrade:${{ matrix.pg_target }}-${{ matrix.operating_system.flavor }}${{ matrix.operating_system.version }}"
"pgautoupgrade/pgautoupgrade:${{ matrix.pg_target }}-${{ matrix.operating_system.flavor }}${{ matrix.operating_system.OS_VERSION }}"
build-args: |
"PGTARGET=${{ matrix.pg_target }}"
cache-to: type=inline
Expand Down Expand Up @@ -145,7 +146,7 @@ jobs:
platforms: linux/amd64,linux/arm64
tags: |
"pgautoupgrade/pgautoupgrade:${{ matrix.pg_target }}-${{ matrix.operating_system.flavor }}"
"pgautoupgrade/pgautoupgrade:${{ matrix.pg_target }}-${{ matrix.operating_system.flavor }}${{ matrix.operating_system.version }}"
"pgautoupgrade/pgautoupgrade:${{ matrix.pg_target }}-${{ matrix.operating_system.flavor }}${{ matrix.operating_system.OS_VERSION }}"
build-args: |
"PGTARGET=${{ matrix.pg_target }}"
push: true
Expand Down
17 changes: 10 additions & 7 deletions Dockerfile.alpine
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,30 @@
ARG PGTARGET=17

# renovate: datasource=docker depName=alpine versioning=loose
ARG ALPINE_VERSION=3.20

### Things we need in all build containers
FROM alpine:3.20 AS base-build
FROM alpine:${ALPINE_VERSION} AS base-build

# The versions of PostgreSQL to use
ENV PG95=9.5.25
ENV PG96=9.6.24
ENV PG10=10.23
ENV PG11=11.22

# renovate: datasource=repology depName=macports/postgresql12-server versioning=loose
# renovate: datasource=repology depName=homebrew/postgresql@12 versioning=loose
ENV PG12_VERSION=12.22

# renovate: datasource=repology depName=macports/postgresql13-server versioning=loose
# renovate: datasource=repology depName=homebrew/postgresql@13 versioning=loose
ENV PG13_VERSION=13.18

# renovate: datasource=repology depName=macports/postgresql14-server versioning=loose
# renovate: datasource=repology depName=homebrew/postgresql@14 versioning=loose
ENV PG14_VERSION=14.15

# renovate: datasource=repology depName=macports/postgresql15-server versioning=loose
# renovate: datasource=repology depName=homebrew/postgresql@15 versioning=loose
ENV PG15_VERSION=15.10

# renovate: datasource=repology depName=macports/postgresql16-server versioning=loose
# renovate: datasource=repology depName=homebrew/postgresql@16 versioning=loose
ENV PG16_VERSION=16.6

# Where we'll do all our compiling and similar
Expand Down Expand Up @@ -145,7 +148,7 @@ RUN cd postgresql-16.* && \
rm -rf /usr/local-pg16/include

# Use the PostgreSQL Alpine image as our output image base
FROM postgres:${PGTARGET}-alpine3.20
FROM postgres:${PGTARGET}-alpine${ALPINE_VERSION}

# We need to define this here, to make the above PGTARGET available after the FROM
ARG PGTARGET
Expand Down
10 changes: 5 additions & 5 deletions Dockerfile.bookworm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,19 @@ ENV PG96=9.6.24
ENV PG10=10.23
ENV PG11=11.22

# renovate: datasource=repology depName=macports/postgresql12-server versioning=loose
# renovate: datasource=repology depName=homebrew/postgresql@12 versioning=loose
ENV PG12_VERSION=12.22

# renovate: datasource=repology depName=macports/postgresql13-server versioning=loose
# renovate: datasource=repology depName=homebrew/postgresql@13 versioning=loose
ENV PG13_VERSION=13.18

# renovate: datasource=repology depName=macports/postgresql14-server versioning=loose
# renovate: datasource=repology depName=homebrew/postgresql@14 versioning=loose
ENV PG14_VERSION=14.15

# renovate: datasource=repology depName=macports/postgresql15-server versioning=loose
# renovate: datasource=repology depName=homebrew/postgresql@15 versioning=loose
ENV PG15_VERSION=15.10

# renovate: datasource=repology depName=macports/postgresql16-server versioning=loose
# renovate: datasource=repology depName=homebrew/postgresql@16 versioning=loose
ENV PG16_VERSION=16.6

# Where we'll do all our compiling and similar
Expand Down
3 changes: 2 additions & 1 deletion renovate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"config:recommended",
"customManagers:dockerfileVersions"
"customManagers:dockerfileVersions",
"customManagers:githubActionsVersions"
]
}
Loading