healthchecks added

Author: Roman Rafacz

Dockerfile

@@ -55,6 +55,6 @@ EXPOSE 5432
 
 USER postgres
 
-#HEALTHCHECK CMD ["/usr/local/bin/docker-healthcheck.sh"]
+HEALTHCHECK CMD ["/usr/local/bin/docker-healthcheck.sh"]
 
 ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]

README.md

@@ -2,10 +2,7 @@
 
 Introduction
 
-This repository contains the Dockerfiles used to build a PostgresSQL server.
-
-We currently built and maintained  for:
-
+This repository contains the Dockerfiles used to build a PostgresSQL server, currently built and maintained  for:
 PostgresSQL 14.0
 
 # building
@@ -14,3 +11,14 @@ PostgresSQL 14.0
 
 # tests
 
+# TODO 
+ - Healthchecks
+ - Tests - create them
+   - Standalone
+   - Replica
+   - Backup and Restore
+   - Create Test application to read/write  
+ - Generate certificates to use(or default ones may be ok)
+ - Deploy to ECS
+ - fix logging
+    -  try logging in with a non existing user, docker will show error. postgres no.. actually no logss

docker-entrypoint.sh

@@ -1,16 +1,7 @@
 #!/usr/bin/env bash
 
 set -o pipefail
-set -eux
-#
-POSTGRES_USER=${POSTGRES_USER:-postgres}
-POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-password}
-PWFILE=/tmp/postgres_password
-PG_DATA=${PG_DATA:-/var/lib/postgresql/main}
-POSTGRES_LOGS_DIR=/var/log/postgresql
-POSTGRES_LOGS_FILE=/var/log/postgresql/postgresql.log
-POSTGRES_CLUSTER=${POSTGRES_CLUSTER:-genera}
-POSTGRES_CONFIG=${POSTGRES_CONFIG:-/etc/postgresql/postgresql.conf}
+set -eu
 
 function setup_environment() {
 
@@ -29,26 +20,63 @@ function setup_environment() {
     chown -R postgres:postgres "${POSTGRES_LOGS_FILE}"
   fi
 
-  cat <<< "${POSTGRES_PASSWORD}" > "${PWFILE}"
+  cat <<< "${POSTGRES_DEFAULT_PASSWORD}" > "${PW_FILE}"
 
   return 0
 
 }
 
 function initialize_database() {
 
-  /usr/lib/postgresql/14/bin/initdb --pgdata="${PG_DATA}" --username="${POSTGRES_USER}" --pwfile="${PWFILE}" --data-checksums
+  /usr/lib/postgresql/14/bin/initdb --pgdata="${PG_DATA}" --username="${POSTGRES_DEFAULT_USER}" --pwfile="${PW_FILE}" --data-checksums
 
-  rm "${PWFILE}"
+  rm "${PW_FILE}"
 
   return 0
 
 }
 
+# Used mainly for docker tests/healthcheck user but also to setup initial users
+function setupUsers() {
+
+  temp_sql=$(mktemp /tmp/user_update.XXXXXX)
+
+  if [[ "${ADMIN_USER}" != nil && "${ADMIN_PASSWORD}" != nil && "${POSTGRES_DATABASE}" != nil ]];then
+    /usr/lib/postgresql/14/bin/pg_ctl -D "${PG_DATA}" -l ${POSTGRES_LOGS_FILE} start
+    # create grants for these users for database x
+    /usr/lib/postgresql/14/bin/createuser --superuser "${ADMIN_USER}"
+    /usr/lib/postgresql/14/bin/createdb "${POSTGRES_DATABASE}"
+
+    cat <<< "ALTER USER ${ADMIN_USER} PASSWORD '${ADMIN_PASSWORD}'" > "${temp_sql}"
+    psql -a -q -f "${temp_sql}"
+    /usr/lib/postgresql/14/bin/pg_ctl -D "${PG_DATA}" stop
+    rm "${temp_sql}"
+  fi
+
+  return 0
+}
+
+# postgres settings/configs/directories
+POSTGRES_DEFAULT_USER=${POSTGRES_DEFAULT_USER:-postgres}
+POSTGRES_DEFAULT_PASSWORD=${POSTGRES_DEFAULT_PASSWORD:-password}
+PW_FILE=/tmp/postgres_password
+PG_DATA=${PG_DATA:-/var/lib/postgresql/main}
+POSTGRES_LOGS_DIR=/var/log/postgresql
+POSTGRES_LOGS_FILE=/var/log/postgresql/postgresql.log
+POSTGRES_CLUSTER=${POSTGRES_CLUSTER:-genera}
+POSTGRES_CONFIG=${POSTGRES_CONFIG:-/etc/postgresql/postgresql.conf}
+
+# additional users/databases
+POSTGRES_DATABASE=${POSTGRES_DATABASE:-nil}
+ADMIN_USER=${ADMIN_USER:-nil}
+ADMIN_PASSWORD=${ADMIN_PASSWORD:-nil}
+POSTGRES_HEALTHCHECK_USER=${POSTGRES_HEALTHCHECK_USER:-healthcheck}
+POSTGRES_HEALTHCHECK_PASSWD=${MYSQL_HEALTHCHECK_PASSWD:-nil}
+
 setup_environment || exit 1
 initialize_database || exit 1
+setupUsers || exit 1
 
-# Working
 eval "exec /usr/lib/postgresql/14/bin/postgres -D ${PG_DATA} -c config_file=/etc/postgresql/postgresql.conf"
 
 # What i should get working...maybe?

docker-healthcheck.sh

@@ -3,3 +3,15 @@
 set -o pipefail
 set -eu
 
+POSTGRES_STATUS_CODE=""
+
+if /usr/lib/postgresql/14/bin/pg_isready -d postgres://localhost:5432/template; then
+  POSTGRES_STATUS_CODE="200";
+else
+  POSTGRES_STATUS_CODE="500";
+  exit 1
+fi
+
+exit 0
+
+

tests/postgres-standalone.sh

@@ -0,0 +1,25 @@
+---
+version: '2.2'
+networks:
+  postgres_test:
+    driver: bridge
+services:
+  postgres:
+    image: romedawg/postgres-14:latest
+    hostname: postgres
+    container_name: postgres
+    domainname: romedawg.com
+    user: postgres
+    networks:
+      postgres_test:
+        aliases:
+          - postgres
+          - postgres.romedawg.com
+    ports:
+      - '5432:5432'
+    environment:
+      ADMIN_USER: admin
+      ADMIN_PASSWORD: password
+      POSTGRES_DATABASE: admin
+
+