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

fix(postgresql-16): Use latest entrypoint scripts #17698

Merged
merged 1 commit into from
Apr 25, 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
19 changes: 15 additions & 4 deletions postgresql-16.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package:
name: postgresql-16
version: "16.2"
epoch: 7
epoch: 8
description: A sophisticated object-relational DBMS
copyright:
- license: BSD-3-Clause
Expand All @@ -12,6 +12,9 @@ package:
- ${{package.name}}-base=${{package.full-version}}

environment:
environment:
# Used to fetch docker scripts
ALPINE_VERSION: "3.19"
contents:
packages:
- autoconf
Expand All @@ -21,6 +24,7 @@ environment:
- build-base
- busybox
- ca-certificates-bundle
- curl
- execline-dev
- flex
- icu-dev
Expand Down Expand Up @@ -173,7 +177,12 @@ subpackages:
pipeline:
- runs: |
mkdir -p ${{targets.subpkgdir}}/usr/libexec/${{vars.mangled-package-name}}
install -Dm755 postgresql-entrypoint.sh ${{targets.subpkgdir}}/usr/libexec/${{vars.mangled-package-name}}/postgresql-entrypoint.sh
curl https://raw.githubusercontent.com/docker-library/postgres/master/16/alpine"${ALPINE_VERSION}"/docker-entrypoint.sh -o \
${{targets.subpkgdir}}/usr/libexec/${{vars.mangled-package-name}}/docker-entrypoint.sh
curl https://raw.githubusercontent.com/docker-library/postgres/master/16/alpine"${ALPINE_VERSION}"/docker-ensure-initdb.sh -o \
${{targets.subpkgdir}}/usr/libexec/${{vars.mangled-package-name}}/docker-ensure-initdb.sh
sed -i "s|/docker-entrypoint-initdb.d|/var/lib/postgres/initdb|g" ${{targets.subpkgdir}}/usr/libexec/${{vars.mangled-package-name}}/*.sh
chmod +x ${{targets.subpkgdir}}/usr/libexec/${{vars.mangled-package-name}}/*.sh

- name: ${{package.name}}-oci-entrypoint
description: Entrypoint for using PostgreSQL in OCI containers
Expand All @@ -186,8 +195,10 @@ subpackages:
- runs: |
mkdir -p ${{targets.subpkgdir}}/usr/bin
mkdir -p ${{targets.subpkgdir}}/var/lib/postgres/initdb
ln -s /usr/libexec/${{vars.mangled-package-name}}/postgresql-entrypoint.sh ${{targets.subpkgdir}}/usr/bin/postgresql-entrypoint.sh
ln -s /usr/libexec/${{vars.mangled-package-name}}/postgresql-entrypoint.sh ${{targets.subpkgdir}}/var/lib/postgres/initdb/postgresql-entrypoint.sh
ln -s /usr/libexec/${{vars.mangled-package-name}}/docker-entrypoint.sh ${{targets.subpkgdir}}/usr/bin/docker-entrypoint.sh
ln -s /usr/libexec/${{vars.mangled-package-name}}/docker-entrypoint.sh ${{targets.subpkgdir}}/var/lib/postgres/initdb/docker-entrypoint.sh
ln -s /usr/libexec/${{vars.mangled-package-name}}/docker-ensure-initdb.sh ${{targets.subpkgdir}}/usr/bin/docker-ensure-initdb.sh
ln -s /usr/libexec/${{vars.mangled-package-name}}/docker-ensure-initdb.sh ${{targets.subpkgdir}}/var/lib/postgres/initdb/docker-ensure-initdb.sh

- name: ${{package.name}}-bitnami-compat
description: "compat package with postgresql image"
Expand Down
343 changes: 0 additions & 343 deletions postgresql-16/postgresql-entrypoint.sh

This file was deleted.