From 393d226f6df4d73217803236f68980a5d44b00cb Mon Sep 17 00:00:00 2001 From: Scott Koranda Date: Mon, 13 Sep 2021 06:43:47 -0500 Subject: [PATCH] Update PostgreSQL base to postgres:13-buster Update the base image for comanage-registry-postgres to be postgres:13-buster. --- comanage-registry-postgres/Dockerfile | 4 +--- .../comanage-registry-postgres-entrypoint.sh | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/comanage-registry-postgres/Dockerfile b/comanage-registry-postgres/Dockerfile index 5e78d5b..8328df3 100644 --- a/comanage-registry-postgres/Dockerfile +++ b/comanage-registry-postgres/Dockerfile @@ -16,7 +16,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:9.6 +FROM postgres:13-buster ENV INIT_DIR /docker-entrypoint-initdb.d @@ -38,8 +38,6 @@ ENV COMANAGE_REGISTRY_POSTGRES_DATABASE ${COMANAGE_REGISTRY_POSTGRES_DATABASE:-r ENV COMANAGE_REGISTRY_POSTGRES_USER ${COMANAGE_REGISTRY_POSTGRES_USER:-registry_user} ENV COMANAGE_REGISTRY_POSTGRES_USER_PASSWORD ${COMANAGE_REGISTRY_POSTGRES_USER_PASSWORD:-password} -ENV POSTGRES_PASSWORD ${COMANAGE_REGISTRY_POSTGRES_USER_PASSWORD:-password} - ENTRYPOINT ["/usr/local/bin/comanage-registry-postgres-entrypoint.sh"] CMD ["postgres"] diff --git a/comanage-registry-postgres/comanage-registry-postgres-entrypoint.sh b/comanage-registry-postgres/comanage-registry-postgres-entrypoint.sh index 43084e1..4c6af7c 100755 --- a/comanage-registry-postgres/comanage-registry-postgres-entrypoint.sh +++ b/comanage-registry-postgres/comanage-registry-postgres-entrypoint.sh @@ -39,4 +39,4 @@ if [[ -z "${POSTGRES_PASSWORD}" && -z "${POSTGRES_PASSWORD_FILE}" ]]; then export POSTGRES_PASSWORD fi -exec "/docker-entrypoint.sh" "$@" +exec "docker-entrypoint.sh" "$@"