Update postgres #15892
Merged
Update postgres #15892
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Changes: - docker-library/postgres@def0855: Merge pull request docker-library/postgres#1164 from LaurentGoderre/remove-inline-sbom - docker-library/postgres@1d4651c: Revert "Added inline SBOM for binaries downloaded outside package manager" - docker-library/postgres@d8c3360: Merge pull request docker-library/postgres#1162 from infosiftr/eol-11 - docker-library/postgres@3e5f87d: Remove PostgreSQL 11 since it is end of life
Diff for d2934e6:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 3506a33..806215e 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,26 +1,6 @@
Maintainers: Tianon Gravi <[email protected]> (@tianon), Joseph Ferguson <[email protected]> (@yosifkit)
GitRepo: https://github.com/docker-library/postgres.git
-Tags: 11.22-alpine3.18, 11-alpine3.18
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 2468c9d91a2ef4055411e09c42cd054732ebf579
-Directory: 11/alpine3.18
-
-Tags: 11.22-alpine3.19, 11-alpine3.19, 11.22-alpine, 11-alpine
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 25f6ba56f915bb41b2e2def0ed3acc5ae5439f44
-Directory: 11/alpine3.19
-
-Tags: 11.22-bookworm, 11-bookworm
-Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: a42b68455866552c2ad2fc9a8e18d46b50712139
-Directory: 11/bookworm
-
-Tags: 11.22-bullseye, 11-bullseye
-Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: a42b68455866552c2ad2fc9a8e18d46b50712139
-Directory: 11/bullseye
-
Tags: 12.17, 12, 12.17-bookworm, 12-bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
GitCommit: a42b68455866552c2ad2fc9a8e18d46b50712139
@@ -28,12 +8,12 @@ Directory: 12/bookworm
Tags: 12.17-alpine3.18, 12-alpine3.18
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 2468c9d91a2ef4055411e09c42cd054732ebf579
+GitCommit: 1d4651c6c9ee4caf314a62a41111e7c65710f77e
Directory: 12/alpine3.18
Tags: 12.17-alpine3.19, 12-alpine3.19, 12.17-alpine, 12-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 25f6ba56f915bb41b2e2def0ed3acc5ae5439f44
+GitCommit: 1d4651c6c9ee4caf314a62a41111e7c65710f77e
Directory: 12/alpine3.19
Tags: 12.17-bullseye, 12-bullseye
@@ -48,12 +28,12 @@ Directory: 13/bookworm
Tags: 13.13-alpine3.18, 13-alpine3.18
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 2468c9d91a2ef4055411e09c42cd054732ebf579
+GitCommit: 1d4651c6c9ee4caf314a62a41111e7c65710f77e
Directory: 13/alpine3.18
Tags: 13.13-alpine3.19, 13-alpine3.19, 13.13-alpine, 13-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 25f6ba56f915bb41b2e2def0ed3acc5ae5439f44
+GitCommit: 1d4651c6c9ee4caf314a62a41111e7c65710f77e
Directory: 13/alpine3.19
Tags: 13.13-bullseye, 13-bullseye
@@ -68,12 +48,12 @@ Directory: 14/bookworm
Tags: 14.10-alpine3.18, 14-alpine3.18
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 2468c9d91a2ef4055411e09c42cd054732ebf579
+GitCommit: 1d4651c6c9ee4caf314a62a41111e7c65710f77e
Directory: 14/alpine3.18
Tags: 14.10-alpine3.19, 14-alpine3.19, 14.10-alpine, 14-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 25f6ba56f915bb41b2e2def0ed3acc5ae5439f44
+GitCommit: 1d4651c6c9ee4caf314a62a41111e7c65710f77e
Directory: 14/alpine3.19
Tags: 14.10-bullseye, 14-bullseye
@@ -88,12 +68,12 @@ Directory: 15/bookworm
Tags: 15.5-alpine3.18, 15-alpine3.18
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 2468c9d91a2ef4055411e09c42cd054732ebf579
+GitCommit: 1d4651c6c9ee4caf314a62a41111e7c65710f77e
Directory: 15/alpine3.18
Tags: 15.5-alpine3.19, 15-alpine3.19, 15.5-alpine, 15-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 25f6ba56f915bb41b2e2def0ed3acc5ae5439f44
+GitCommit: 1d4651c6c9ee4caf314a62a41111e7c65710f77e
Directory: 15/alpine3.19
Tags: 15.5-bullseye, 15-bullseye
@@ -108,12 +88,12 @@ Directory: 16/bookworm
Tags: 16.1-alpine3.18, 16-alpine3.18, alpine3.18
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 2468c9d91a2ef4055411e09c42cd054732ebf579
+GitCommit: 1d4651c6c9ee4caf314a62a41111e7c65710f77e
Directory: 16/alpine3.18
Tags: 16.1-alpine3.19, 16-alpine3.19, alpine3.19, 16.1-alpine, 16-alpine, alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 25f6ba56f915bb41b2e2def0ed3acc5ae5439f44
+GitCommit: 1d4651c6c9ee4caf314a62a41111e7c65710f77e
Directory: 16/alpine3.19
Tags: 16.1-bullseye, 16-bullseye, bullseye
diff --git a/_bashbrew-list b/_bashbrew-list
index bf8f14b..98bfe6e 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,13 +1,3 @@
-postgres:11-alpine
-postgres:11-alpine3.18
-postgres:11-alpine3.19
-postgres:11-bookworm
-postgres:11-bullseye
-postgres:11.22-alpine
-postgres:11.22-alpine3.18
-postgres:11.22-alpine3.19
-postgres:11.22-bookworm
-postgres:11.22-bullseye
postgres:12
postgres:12-alpine
postgres:12-alpine3.18
diff --git a/postgres_11-alpine/Dockerfile b/postgres_11-alpine/Dockerfile
deleted file mode 100644
index a76eb7b..0000000
diff --git a/postgres_11-alpine/docker-entrypoint.sh b/postgres_11-alpine/docker-entrypoint.sh
deleted file mode 100755
index a383a36..0000000
diff --git a/postgres_11-alpine3.18/Dockerfile b/postgres_11-alpine3.18/Dockerfile
deleted file mode 100644
index 8e5d701..0000000
diff --git a/postgres_11-alpine3.18/docker-entrypoint.sh b/postgres_11-alpine3.18/docker-entrypoint.sh
deleted file mode 100755
index a383a36..0000000
diff --git a/postgres_11-bookworm/Dockerfile b/postgres_11-bookworm/Dockerfile
deleted file mode 100644
index 4406b7a..0000000
diff --git a/postgres_11-bookworm/docker-entrypoint.sh b/postgres_11-bookworm/docker-entrypoint.sh
deleted file mode 100755
index 0ae0ecf..0000000
diff --git a/postgres_11-bullseye/Dockerfile b/postgres_11-bullseye/Dockerfile
deleted file mode 100644
index ce3e8bb..0000000
diff --git a/postgres_11-bullseye/docker-entrypoint.sh b/postgres_11-bullseye/docker-entrypoint.sh
deleted file mode 100755
index 0ae0ecf..0000000
diff --git a/postgres_12-alpine/Dockerfile b/postgres_12-alpine/Dockerfile
index 6f3347c..d3c4866 100644
--- a/postgres_12-alpine/Dockerfile
+++ b/postgres_12-alpine/Dockerfile
@@ -152,8 +151,7 @@ RUN set -eux; \
/usr/local/share/doc \
/usr/local/share/man \
; \
- echo '{"spdxVersion":"SPDX-2.3","SPDXID":"SPDXRef-DOCUMENT","name":"postgres-sbom","packages":[{"name":"postgres","versionInfo":"12.17","SPDXID":"SPDXRef-Package--postgres","externalRefs":[{"referenceCategory":"PACKAGE-MANAGER","referenceType":"purl","referenceLocator":"pkg:generic/[email protected]?os_name=alpine&os_version=3.19"}],"licenseDeclared":"PostgreSQL"}]}' > /usr/local/postgres.spdx.json \
- ; \
+ \
postgres --version
# make the sample config easier to munge (and "correct by default")
diff --git a/postgres_12-alpine3.18/Dockerfile b/postgres_12-alpine3.18/Dockerfile
index fde4049..13907f6 100644
--- a/postgres_12-alpine3.18/Dockerfile
+++ b/postgres_12-alpine3.18/Dockerfile
@@ -152,8 +151,7 @@ RUN set -eux; \
/usr/local/share/doc \
/usr/local/share/man \
; \
- echo '{"spdxVersion":"SPDX-2.3","SPDXID":"SPDXRef-DOCUMENT","name":"postgres-sbom","packages":[{"name":"postgres","versionInfo":"12.17","SPDXID":"SPDXRef-Package--postgres","externalRefs":[{"referenceCategory":"PACKAGE-MANAGER","referenceType":"purl","referenceLocator":"pkg:generic/[email protected]?os_name=alpine&os_version=3.18"}],"licenseDeclared":"PostgreSQL"}]}' > /usr/local/postgres.spdx.json \
- ; \
+ \
postgres --version
# make the sample config easier to munge (and "correct by default")
diff --git a/postgres_13-alpine/Dockerfile b/postgres_13-alpine/Dockerfile
index e82d1b9..b91d2ed 100644
--- a/postgres_13-alpine/Dockerfile
+++ b/postgres_13-alpine/Dockerfile
@@ -152,8 +151,7 @@ RUN set -eux; \
/usr/local/share/doc \
/usr/local/share/man \
; \
- echo '{"spdxVersion":"SPDX-2.3","SPDXID":"SPDXRef-DOCUMENT","name":"postgres-sbom","packages":[{"name":"postgres","versionInfo":"13.13","SPDXID":"SPDXRef-Package--postgres","externalRefs":[{"referenceCategory":"PACKAGE-MANAGER","referenceType":"purl","referenceLocator":"pkg:generic/[email protected]?os_name=alpine&os_version=3.19"}],"licenseDeclared":"PostgreSQL"}]}' > /usr/local/postgres.spdx.json \
- ; \
+ \
postgres --version
# make the sample config easier to munge (and "correct by default")
diff --git a/postgres_13-alpine3.18/Dockerfile b/postgres_13-alpine3.18/Dockerfile
index cd9936c..ae04764 100644
--- a/postgres_13-alpine3.18/Dockerfile
+++ b/postgres_13-alpine3.18/Dockerfile
@@ -152,8 +151,7 @@ RUN set -eux; \
/usr/local/share/doc \
/usr/local/share/man \
; \
- echo '{"spdxVersion":"SPDX-2.3","SPDXID":"SPDXRef-DOCUMENT","name":"postgres-sbom","packages":[{"name":"postgres","versionInfo":"13.13","SPDXID":"SPDXRef-Package--postgres","externalRefs":[{"referenceCategory":"PACKAGE-MANAGER","referenceType":"purl","referenceLocator":"pkg:generic/[email protected]?os_name=alpine&os_version=3.18"}],"licenseDeclared":"PostgreSQL"}]}' > /usr/local/postgres.spdx.json \
- ; \
+ \
postgres --version
# make the sample config easier to munge (and "correct by default")
diff --git a/postgres_14-alpine/Dockerfile b/postgres_14-alpine/Dockerfile
index 20ac720..ce011a9 100644
--- a/postgres_14-alpine/Dockerfile
+++ b/postgres_14-alpine/Dockerfile
@@ -155,8 +154,7 @@ RUN set -eux; \
/usr/local/share/doc \
/usr/local/share/man \
; \
- echo '{"spdxVersion":"SPDX-2.3","SPDXID":"SPDXRef-DOCUMENT","name":"postgres-sbom","packages":[{"name":"postgres","versionInfo":"14.10","SPDXID":"SPDXRef-Package--postgres","externalRefs":[{"referenceCategory":"PACKAGE-MANAGER","referenceType":"purl","referenceLocator":"pkg:generic/[email protected]?os_name=alpine&os_version=3.19"}],"licenseDeclared":"PostgreSQL"}]}' > /usr/local/postgres.spdx.json \
- ; \
+ \
postgres --version
# make the sample config easier to munge (and "correct by default")
diff --git a/postgres_14-alpine3.18/Dockerfile b/postgres_14-alpine3.18/Dockerfile
index 9856dcc..4180502 100644
--- a/postgres_14-alpine3.18/Dockerfile
+++ b/postgres_14-alpine3.18/Dockerfile
@@ -155,8 +154,7 @@ RUN set -eux; \
/usr/local/share/doc \
/usr/local/share/man \
; \
- echo '{"spdxVersion":"SPDX-2.3","SPDXID":"SPDXRef-DOCUMENT","name":"postgres-sbom","packages":[{"name":"postgres","versionInfo":"14.10","SPDXID":"SPDXRef-Package--postgres","externalRefs":[{"referenceCategory":"PACKAGE-MANAGER","referenceType":"purl","referenceLocator":"pkg:generic/[email protected]?os_name=alpine&os_version=3.18"}],"licenseDeclared":"PostgreSQL"}]}' > /usr/local/postgres.spdx.json \
- ; \
+ \
postgres --version
# make the sample config easier to munge (and "correct by default")
diff --git a/postgres_15-alpine/Dockerfile b/postgres_15-alpine/Dockerfile
index d419a42..6389458 100644
--- a/postgres_15-alpine/Dockerfile
+++ b/postgres_15-alpine/Dockerfile
@@ -158,8 +157,7 @@ RUN set -eux; \
/usr/local/share/doc \
/usr/local/share/man \
; \
- echo '{"spdxVersion":"SPDX-2.3","SPDXID":"SPDXRef-DOCUMENT","name":"postgres-sbom","packages":[{"name":"postgres","versionInfo":"15.5","SPDXID":"SPDXRef-Package--postgres","externalRefs":[{"referenceCategory":"PACKAGE-MANAGER","referenceType":"purl","referenceLocator":"pkg:generic/[email protected]?os_name=alpine&os_version=3.19"}],"licenseDeclared":"PostgreSQL"}]}' > /usr/local/postgres.spdx.json \
- ; \
+ \
postgres --version
# make the sample config easier to munge (and "correct by default")
diff --git a/postgres_15-alpine3.18/Dockerfile b/postgres_15-alpine3.18/Dockerfile
index 8fda3e0..63e59bb 100644
--- a/postgres_15-alpine3.18/Dockerfile
+++ b/postgres_15-alpine3.18/Dockerfile
@@ -158,8 +157,7 @@ RUN set -eux; \
/usr/local/share/doc \
/usr/local/share/man \
; \
- echo '{"spdxVersion":"SPDX-2.3","SPDXID":"SPDXRef-DOCUMENT","name":"postgres-sbom","packages":[{"name":"postgres","versionInfo":"15.5","SPDXID":"SPDXRef-Package--postgres","externalRefs":[{"referenceCategory":"PACKAGE-MANAGER","referenceType":"purl","referenceLocator":"pkg:generic/[email protected]?os_name=alpine&os_version=3.18"}],"licenseDeclared":"PostgreSQL"}]}' > /usr/local/postgres.spdx.json \
- ; \
+ \
postgres --version
# make the sample config easier to munge (and "correct by default")
diff --git a/postgres_alpine/Dockerfile b/postgres_alpine/Dockerfile
index 0f98b44..7abdc99 100644
--- a/postgres_alpine/Dockerfile
+++ b/postgres_alpine/Dockerfile
@@ -157,8 +156,7 @@ RUN set -eux; \
/usr/local/share/doc \
/usr/local/share/man \
; \
- echo '{"spdxVersion":"SPDX-2.3","SPDXID":"SPDXRef-DOCUMENT","name":"postgres-sbom","packages":[{"name":"postgres","versionInfo":"16.1","SPDXID":"SPDXRef-Package--postgres","externalRefs":[{"referenceCategory":"PACKAGE-MANAGER","referenceType":"purl","referenceLocator":"pkg:generic/[email protected]?os_name=alpine&os_version=3.19"}],"licenseDeclared":"PostgreSQL"}]}' > /usr/local/postgres.spdx.json \
- ; \
+ \
postgres --version
# make the sample config easier to munge (and "correct by default")
diff --git a/postgres_alpine3.18/Dockerfile b/postgres_alpine3.18/Dockerfile
index c93ecdb..626e269 100644
--- a/postgres_alpine3.18/Dockerfile
+++ b/postgres_alpine3.18/Dockerfile
@@ -157,8 +156,7 @@ RUN set -eux; \
/usr/local/share/doc \
/usr/local/share/man \
; \
- echo '{"spdxVersion":"SPDX-2.3","SPDXID":"SPDXRef-DOCUMENT","name":"postgres-sbom","packages":[{"name":"postgres","versionInfo":"16.1","SPDXID":"SPDXRef-Package--postgres","externalRefs":[{"referenceCategory":"PACKAGE-MANAGER","referenceType":"purl","referenceLocator":"pkg:generic/[email protected]?os_name=alpine&os_version=3.18"}],"licenseDeclared":"PostgreSQL"}]}' > /usr/local/postgres.spdx.json \
- ; \
+ \
postgres --version
# make the sample config easier to munge (and "correct by default")Relevant Maintainers: |
yosifkit
approved these changes
Dec 12, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes: