diff --git a/11/alpine3.17/Dockerfile b/11/alpine3.19/Dockerfile similarity index 98% rename from 11/alpine3.17/Dockerfile rename to 11/alpine3.19/Dockerfile index 6675a1cb21..a76eb7be7e 100644 --- a/11/alpine3.17/Dockerfile +++ b/11/alpine3.19/Dockerfile @@ -5,7 +5,7 @@ # -FROM alpine:3.17 +FROM alpine:3.19 # 70 is the standard uid/gid for "postgres" in Alpine # https://git.alpinelinux.org/aports/tree/main/postgresql/postgresql.pre-install?h=3.12-stable @@ -152,7 +152,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":"11.22","SPDXID":"SPDXRef-Package--postgres","externalRefs":[{"referenceCategory":"PACKAGE-MANAGER","referenceType":"purl","referenceLocator":"pkg:generic/postgres@11.22?os_name=alpine&os_version=3.17"}],"licenseDeclared":"PostgreSQL"}]}' > /usr/local/postgres.spdx.json \ + echo '{"spdxVersion":"SPDX-2.3","SPDXID":"SPDXRef-DOCUMENT","name":"postgres-sbom","packages":[{"name":"postgres","versionInfo":"11.22","SPDXID":"SPDXRef-Package--postgres","externalRefs":[{"referenceCategory":"PACKAGE-MANAGER","referenceType":"purl","referenceLocator":"pkg:generic/postgres@11.22?os_name=alpine&os_version=3.19"}],"licenseDeclared":"PostgreSQL"}]}' > /usr/local/postgres.spdx.json \ ; \ postgres --version diff --git a/11/alpine3.17/docker-entrypoint.sh b/11/alpine3.19/docker-entrypoint.sh similarity index 100% rename from 11/alpine3.17/docker-entrypoint.sh rename to 11/alpine3.19/docker-entrypoint.sh diff --git a/12/alpine3.17/Dockerfile b/12/alpine3.19/Dockerfile similarity index 98% rename from 12/alpine3.17/Dockerfile rename to 12/alpine3.19/Dockerfile index f7f9284cbf..6f3347c0ff 100644 --- a/12/alpine3.17/Dockerfile +++ b/12/alpine3.19/Dockerfile @@ -5,7 +5,7 @@ # -FROM alpine:3.17 +FROM alpine:3.19 # 70 is the standard uid/gid for "postgres" in Alpine # https://git.alpinelinux.org/aports/tree/main/postgresql/postgresql.pre-install?h=3.12-stable @@ -152,7 +152,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/postgres@12.17?os_name=alpine&os_version=3.17"}],"licenseDeclared":"PostgreSQL"}]}' > /usr/local/postgres.spdx.json \ + 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/postgres@12.17?os_name=alpine&os_version=3.19"}],"licenseDeclared":"PostgreSQL"}]}' > /usr/local/postgres.spdx.json \ ; \ postgres --version diff --git a/12/alpine3.17/docker-entrypoint.sh b/12/alpine3.19/docker-entrypoint.sh similarity index 100% rename from 12/alpine3.17/docker-entrypoint.sh rename to 12/alpine3.19/docker-entrypoint.sh diff --git a/13/alpine3.17/Dockerfile b/13/alpine3.19/Dockerfile similarity index 98% rename from 13/alpine3.17/Dockerfile rename to 13/alpine3.19/Dockerfile index ab7ceab4b1..e82d1b9db4 100644 --- a/13/alpine3.17/Dockerfile +++ b/13/alpine3.19/Dockerfile @@ -5,7 +5,7 @@ # -FROM alpine:3.17 +FROM alpine:3.19 # 70 is the standard uid/gid for "postgres" in Alpine # https://git.alpinelinux.org/aports/tree/main/postgresql/postgresql.pre-install?h=3.12-stable @@ -152,7 +152,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/postgres@13.13?os_name=alpine&os_version=3.17"}],"licenseDeclared":"PostgreSQL"}]}' > /usr/local/postgres.spdx.json \ + 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/postgres@13.13?os_name=alpine&os_version=3.19"}],"licenseDeclared":"PostgreSQL"}]}' > /usr/local/postgres.spdx.json \ ; \ postgres --version diff --git a/13/alpine3.17/docker-entrypoint.sh b/13/alpine3.19/docker-entrypoint.sh similarity index 100% rename from 13/alpine3.17/docker-entrypoint.sh rename to 13/alpine3.19/docker-entrypoint.sh diff --git a/14/alpine3.17/Dockerfile b/14/alpine3.19/Dockerfile similarity index 98% rename from 14/alpine3.17/Dockerfile rename to 14/alpine3.19/Dockerfile index 4283c5f1b0..20ac720b77 100644 --- a/14/alpine3.17/Dockerfile +++ b/14/alpine3.19/Dockerfile @@ -5,7 +5,7 @@ # -FROM alpine:3.17 +FROM alpine:3.19 # 70 is the standard uid/gid for "postgres" in Alpine # https://git.alpinelinux.org/aports/tree/main/postgresql/postgresql.pre-install?h=3.12-stable @@ -155,7 +155,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/postgres@14.10?os_name=alpine&os_version=3.17"}],"licenseDeclared":"PostgreSQL"}]}' > /usr/local/postgres.spdx.json \ + 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/postgres@14.10?os_name=alpine&os_version=3.19"}],"licenseDeclared":"PostgreSQL"}]}' > /usr/local/postgres.spdx.json \ ; \ postgres --version diff --git a/14/alpine3.17/docker-entrypoint.sh b/14/alpine3.19/docker-entrypoint.sh similarity index 100% rename from 14/alpine3.17/docker-entrypoint.sh rename to 14/alpine3.19/docker-entrypoint.sh diff --git a/15/alpine3.17/Dockerfile b/15/alpine3.19/Dockerfile similarity index 99% rename from 15/alpine3.17/Dockerfile rename to 15/alpine3.19/Dockerfile index 324f745d35..d419a42cae 100644 --- a/15/alpine3.17/Dockerfile +++ b/15/alpine3.19/Dockerfile @@ -5,7 +5,7 @@ # -FROM alpine:3.17 +FROM alpine:3.19 # 70 is the standard uid/gid for "postgres" in Alpine # https://git.alpinelinux.org/aports/tree/main/postgresql/postgresql.pre-install?h=3.12-stable @@ -158,7 +158,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/postgres@15.5?os_name=alpine&os_version=3.17"}],"licenseDeclared":"PostgreSQL"}]}' > /usr/local/postgres.spdx.json \ + 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/postgres@15.5?os_name=alpine&os_version=3.19"}],"licenseDeclared":"PostgreSQL"}]}' > /usr/local/postgres.spdx.json \ ; \ postgres --version diff --git a/15/alpine3.17/docker-entrypoint.sh b/15/alpine3.19/docker-entrypoint.sh similarity index 100% rename from 15/alpine3.17/docker-entrypoint.sh rename to 15/alpine3.19/docker-entrypoint.sh diff --git a/16/alpine3.17/Dockerfile b/16/alpine3.19/Dockerfile similarity index 99% rename from 16/alpine3.17/Dockerfile rename to 16/alpine3.19/Dockerfile index ef93501447..0f98b442c0 100644 --- a/16/alpine3.17/Dockerfile +++ b/16/alpine3.19/Dockerfile @@ -5,7 +5,7 @@ # -FROM alpine:3.17 +FROM alpine:3.19 # 70 is the standard uid/gid for "postgres" in Alpine # https://git.alpinelinux.org/aports/tree/main/postgresql/postgresql.pre-install?h=3.12-stable @@ -157,7 +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":"16.1","SPDXID":"SPDXRef-Package--postgres","externalRefs":[{"referenceCategory":"PACKAGE-MANAGER","referenceType":"purl","referenceLocator":"pkg:generic/postgres@16.1?os_name=alpine&os_version=3.17"}],"licenseDeclared":"PostgreSQL"}]}' > /usr/local/postgres.spdx.json \ + 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/postgres@16.1?os_name=alpine&os_version=3.19"}],"licenseDeclared":"PostgreSQL"}]}' > /usr/local/postgres.spdx.json \ ; \ postgres --version diff --git a/16/alpine3.17/docker-entrypoint.sh b/16/alpine3.19/docker-entrypoint.sh similarity index 100% rename from 16/alpine3.17/docker-entrypoint.sh rename to 16/alpine3.19/docker-entrypoint.sh diff --git a/versions.json b/versions.json index f4acc7ebf5..cb4d0f2acd 100644 --- a/versions.json +++ b/versions.json @@ -1,6 +1,6 @@ { "11": { - "alpine": "3.18", + "alpine": "3.19", "bookworm": { "arches": [ "amd64", @@ -25,13 +25,13 @@ "variants": [ "bookworm", "bullseye", - "alpine3.18", - "alpine3.17" + "alpine3.19", + "alpine3.18" ], "version": "11.22" }, "12": { - "alpine": "3.18", + "alpine": "3.19", "bookworm": { "arches": [ "amd64", @@ -56,13 +56,13 @@ "variants": [ "bookworm", "bullseye", - "alpine3.18", - "alpine3.17" + "alpine3.19", + "alpine3.18" ], "version": "12.17" }, "13": { - "alpine": "3.18", + "alpine": "3.19", "bookworm": { "arches": [ "amd64", @@ -87,13 +87,13 @@ "variants": [ "bookworm", "bullseye", - "alpine3.18", - "alpine3.17" + "alpine3.19", + "alpine3.18" ], "version": "13.13" }, "14": { - "alpine": "3.18", + "alpine": "3.19", "bookworm": { "arches": [ "amd64", @@ -118,13 +118,13 @@ "variants": [ "bookworm", "bullseye", - "alpine3.18", - "alpine3.17" + "alpine3.19", + "alpine3.18" ], "version": "14.10" }, "15": { - "alpine": "3.18", + "alpine": "3.19", "bookworm": { "arches": [ "amd64", @@ -149,13 +149,13 @@ "variants": [ "bookworm", "bullseye", - "alpine3.18", - "alpine3.17" + "alpine3.19", + "alpine3.18" ], "version": "15.5" }, "16": { - "alpine": "3.18", + "alpine": "3.19", "bookworm": { "arches": [ "amd64", @@ -180,8 +180,8 @@ "variants": [ "bookworm", "bullseye", - "alpine3.18", - "alpine3.17" + "alpine3.19", + "alpine3.18" ], "version": "16.1" } diff --git a/versions.sh b/versions.sh index 7c044441b7..50285beefb 100755 --- a/versions.sh +++ b/versions.sh @@ -7,8 +7,8 @@ supportedDebianSuites=( bullseye ) supportedAlpineVersions=( + 3.19 3.18 - 3.17 ) defaultDebianSuite="${supportedDebianSuites[0]}" declare -A debianSuites=(