diff --git a/.github/generate-strategy.sh b/.github/generate-strategy.sh index 81521b82..83999570 100755 --- a/.github/generate-strategy.sh +++ b/.github/generate-strategy.sh @@ -10,7 +10,7 @@ set -eu # Define an optional aliases for some major versions declare -A aliases=( - [14]='latest' + [15]='latest' ) cd "$(dirname "$(readlink -f "${BASH_SOURCE[0]}/..")")" diff --git a/Debian/Dockerfile.template b/Debian/Dockerfile.template index 9fefd54e..fdfa82eb 100644 --- a/Debian/Dockerfile.template +++ b/Debian/Dockerfile.template @@ -1,5 +1,5 @@ # vim:set ft=dockerfile: -# +# # Copyright The CloudNativePG Contributors # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -13,7 +13,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -# +# FROM postgres:%%POSTGRES_IMAGE_VERSION%% # Do not split the description, otherwise we will see a blank space in the labels diff --git a/Debian/update.sh b/Debian/update.sh index d968ee4a..74e50f57 100755 --- a/Debian/update.sh +++ b/Debian/update.sh @@ -30,8 +30,8 @@ versions=("${versions[@]%/}") # Get the last postgres base image tag and update time fetch_postgres_image_version() { - local suite="$1"; - local item="$2"; + local suite="$1"; + local item="$2"; curl -SsL "https://registry.hub.docker.com/v2/repositories/library/postgres/tags/?name=bullseye&ordering=last_updated&page_size=20" | \ jq -c ".results[] | select( .name | match(\"^${suite}.[a-z0-9]+-bullseye\"))" | \ jq -r ".${item}" | \ @@ -123,9 +123,9 @@ generate_postgres() { record_version "${versionFile}" "BARMAN_VERSION" "${barmanVersion}" fi - if [ "$oldPostgresImageVersion" != "$postgresImageVersion" ]; then - echo "PostgreSQL base image changed from $oldPostgresImageVersion to $postgresImageVersion" - record_version "${versionFile}" "IMAGE_RELEASE_VERSION" 1 + if [ "$oldPostgresImageVersion" != "$postgresImageVersion" ]; then + echo "PostgreSQL base image changed from $oldPostgresImageVersion to $postgresImageVersion" + record_version "${versionFile}" "IMAGE_RELEASE_VERSION" 1 record_version "${versionFile}" "POSTGRES_IMAGE_VERSION" "${postgresImageVersion}" imageReleaseVersion=1 elif [ "$newRelease" = "true" ]; then @@ -133,10 +133,10 @@ generate_postgres() { record_version "${versionFile}" "IMAGE_RELEASE_VERSION" $imageReleaseVersion fi - dockerTemplate="Dockerfile.template" - if [ "${version}" -gt '15' ]; then - dockerTemplate="Dockerfile-beta.template" - fi + dockerTemplate="Dockerfile.template" + if [ "${version}" -gt '15' ]; then + dockerTemplate="Dockerfile-beta.template" + fi cp -r src/* "$version/" sed -e 's/%%POSTGRES_IMAGE_VERSION%%/'"$postgresImageVersion"'/g' \