From d30059bccc3ef6442d18b0bd84347c027458e5ea Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Wed, 19 Apr 2017 17:27:32 +0200 Subject: [PATCH 01/23] initial version of the postgresql modulemd file --- postgresql.yaml | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 postgresql.yaml diff --git a/postgresql.yaml b/postgresql.yaml new file mode 100644 index 0000000..993eee8 --- /dev/null +++ b/postgresql.yaml @@ -0,0 +1,42 @@ +document: modulemd +version: 1 +data: + # name, stream, version are filled in by the build system + #name: "" + #stream: "" + #version: 0 + summary: 'The programs needed to create and run a PostgreSQL server' + description: |- + PostgreSQL is an advanced Object-Relational database management system + (DBMS). The postgresql-server package contains the programs needed to + create and run a PostgreSQL server, which will in turn allow you to create + and maintain PostgreSQL databases. + license: + module: + - MIT + content: + - PostgreSQL + dependencies: + buildrequires: + base-runtime: f26 + common-build-dependencies: master + requires: + base-runtime: f26 + api: + rpms: + - postgresql + profiles: + default: + rpms: + - postgresql-server + client: + rpms: + - postgresql + filter: {} + components: + rpms: + # part of common-build-dependencies: + # multilib-rpm-config, gettext + uuid: + rationale: 'Build dependency (for postgresql-contrib).' + ref: f26 From 864a6140dc453734530a97a0dc5de4bfe6af698c Mon Sep 17 00:00:00 2001 From: "Petr \"Stone\" Hracek" Date: Thu, 20 Apr 2017 12:28:38 +0200 Subject: [PATCH 02/23] Add perl dependency Signed-off-by: Petr "Stone" Hracek --- postgresql.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/postgresql.yaml b/postgresql.yaml index 993eee8..2351873 100644 --- a/postgresql.yaml +++ b/postgresql.yaml @@ -19,7 +19,8 @@ data: dependencies: buildrequires: base-runtime: f26 - common-build-dependencies: master + common-build-dependencies: f26 + perl: f26 requires: base-runtime: f26 api: From ea0fe5cee5354f5b444acddfce53cdcdb31925ca Mon Sep 17 00:00:00 2001 From: "Petr \"Stone\" Hracek" Date: Thu, 20 Apr 2017 12:29:55 +0200 Subject: [PATCH 03/23] Using proper tag. Signed-off-by: Petr "Stone" Hracek --- postgresql.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/postgresql.yaml b/postgresql.yaml index 2351873..0e98fea 100644 --- a/postgresql.yaml +++ b/postgresql.yaml @@ -18,11 +18,11 @@ data: - PostgreSQL dependencies: buildrequires: - base-runtime: f26 - common-build-dependencies: f26 - perl: f26 + base-runtime: master + common-build-dependencies: master + perl: master requires: - base-runtime: f26 + base-runtime: master api: rpms: - postgresql From 14f7b4ae610327a7a0541341c3ed6ccd759f8765 Mon Sep 17 00:00:00 2001 From: "Petr \"Stone\" Hracek" Date: Thu, 20 Apr 2017 12:55:32 +0200 Subject: [PATCH 04/23] Fix perl dependencies Signed-off-by: Petr "Stone" Hracek --- postgresql.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/postgresql.yaml b/postgresql.yaml index 0e98fea..4bcb6cb 100644 --- a/postgresql.yaml +++ b/postgresql.yaml @@ -23,6 +23,7 @@ data: perl: master requires: base-runtime: master + perl: master api: rpms: - postgresql @@ -38,6 +39,17 @@ data: rpms: # part of common-build-dependencies: # multilib-rpm-config, gettext + postgresql: + rationale: 'Build dependency (for postgresql-contrib).' + ref: f26 + buildorder: 10 + autoconf: + rationale: 'Build dependency (for postgresql-contrib).' + ref: f26 uuid: rationale: 'Build dependency (for postgresql-contrib).' ref: f26 + buildorder: 1 + perl-Data-UUID: + rationale: 'Build dependency (for postgresql-contrib).' + ref: f26 From f96469031557b754a5637eac79b6fdc32b5ff767 Mon Sep 17 00:00:00 2001 From: "Petr \"Stone\" Hracek" Date: Fri, 21 Apr 2017 13:22:38 +0200 Subject: [PATCH 05/23] Add common-build-dependencies-bootstrap Signed-off-by: Petr "Stone" Hracek --- postgresql.yaml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/postgresql.yaml b/postgresql.yaml index 4bcb6cb..4a3fef1 100644 --- a/postgresql.yaml +++ b/postgresql.yaml @@ -19,7 +19,9 @@ data: dependencies: buildrequires: base-runtime: master - common-build-dependencies: master + common-build-dependencies: f26 + common-build-dependencies-bootstrap: f26 + shared-userspace: f26 perl: master requires: base-runtime: master @@ -43,9 +45,6 @@ data: rationale: 'Build dependency (for postgresql-contrib).' ref: f26 buildorder: 10 - autoconf: - rationale: 'Build dependency (for postgresql-contrib).' - ref: f26 uuid: rationale: 'Build dependency (for postgresql-contrib).' ref: f26 From 398481abedba0ee1a2cb1876aac267822544afa1 Mon Sep 17 00:00:00 2001 From: "Petr \"Stone\" Hracek" Date: Mon, 24 Apr 2017 15:58:23 +0200 Subject: [PATCH 06/23] Add elinks to private-f27-modules Signed-off-by: Petr "Stone" Hracek --- postgresql.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/postgresql.yaml b/postgresql.yaml index 4a3fef1..73d78c5 100644 --- a/postgresql.yaml +++ b/postgresql.yaml @@ -52,3 +52,7 @@ data: perl-Data-UUID: rationale: 'Build dependency (for postgresql-contrib).' ref: f26 + elinks: + rationale: 'Build dependency (for postgresql-contrib).' + ref: private-f27-modules + buildorder: 3 From ba9d082c942d17210553725349920c0fc4e4149b Mon Sep 17 00:00:00 2001 From: Radoslav Pitonak Date: Thu, 4 May 2017 10:50:54 +0200 Subject: [PATCH 07/23] Dockerfile based on BRT, test suite for module --- Dockerfile | 51 ++++ Makefile | 15 ++ repos/fedora.repo | 5 + repos/postgresql.repo | 4 + root/help.1 | 190 +++++++++++++++ root/usr/bin/cgroup-limits | 92 ++++++++ root/usr/bin/container-entrypoint | 3 + root/usr/bin/run-postgresql | 28 +++ root/usr/bin/run-postgresql-master | 5 + root/usr/bin/run-postgresql-slave | 36 +++ root/usr/libexec/fix-permissions | 7 + .../container-scripts/postgresql/README.md | 98 ++++++++ .../container-scripts/postgresql/common.sh | 220 ++++++++++++++++++ ...ustom-postgresql-replication.conf.template | 7 + .../openshift-custom-postgresql.conf.template | 21 ++ .../openshift-custom-recovery.conf.template | 9 + tests/Makefile | 6 + tests/config.yaml | 14 ++ tests/rpmvalidator.py | 56 +++++ tests/sanity1.py | 46 ++++ tests/sanity2.py | 47 ++++ tests/simpleTest.py | 47 ++++ 22 files changed, 1007 insertions(+) create mode 100644 Dockerfile create mode 100644 Makefile create mode 100644 repos/fedora.repo create mode 100644 repos/postgresql.repo create mode 100644 root/help.1 create mode 100755 root/usr/bin/cgroup-limits create mode 100755 root/usr/bin/container-entrypoint create mode 100755 root/usr/bin/run-postgresql create mode 100755 root/usr/bin/run-postgresql-master create mode 100755 root/usr/bin/run-postgresql-slave create mode 100755 root/usr/libexec/fix-permissions create mode 100644 root/usr/share/container-scripts/postgresql/README.md create mode 100644 root/usr/share/container-scripts/postgresql/common.sh create mode 100644 root/usr/share/container-scripts/postgresql/openshift-custom-postgresql-replication.conf.template create mode 100644 root/usr/share/container-scripts/postgresql/openshift-custom-postgresql.conf.template create mode 100644 root/usr/share/container-scripts/postgresql/openshift-custom-recovery.conf.template create mode 100644 tests/Makefile create mode 100644 tests/config.yaml create mode 100644 tests/rpmvalidator.py create mode 100644 tests/sanity1.py create mode 100644 tests/sanity2.py create mode 100644 tests/simpleTest.py diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..ae334f6 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,51 @@ +FROM baseruntime/baseruntime:latest + +# PostgreSQL image for OpenShift. +# Volumes: +# * /var/lib/psql/data - Database cluster for PostgreSQL +# Environment: +# * $POSTGRESQL_USER - Database user name +# * $POSTGRESQL_PASSWORD - User's password +# * $POSTGRESQL_DATABASE - Name of the database to create +# * $POSTGRESQL_ADMIN_PASSWORD (Optional) - Password for the 'postgres' +# PostgreSQL administrative account + +ENV POSTGRESQL_VERSION=9.5 \ + HOME=/var/lib/pgsql \ + PGUSER=postgres + +LABEL io.k8s.description="PostgreSQL is an advanced Object-Relational database management system" \ + io.k8s.display-name="PostgreSQL 9.5" \ + io.openshift.expose-services="5432:postgresql" \ + io.openshift.tags="database,postgresql,postgresql95" \ + com.redhat.component="postgresql" \ + maintainer="Pavel Raiskup " \ + name="$FCG/postgresql" \ + version="0" \ + release="1.$DISTTAG" \ + architecture="x86_64" \ + usage="Run without arguments to get usage info." \ + help="/help.1" + +EXPOSE 5432 + +ADD root / + +COPY repos/* /etc/yum.repos.d/ + +RUN microdnf --nodocs --enablerepo postgresql install -y postgresql postgresql-server postgresql-contrib && \ + microdnf --nodocs --enablerepo fedora install -y rsync tar gettext bind-utils nss_wrapper findutils python && \ + microdnf clean all && \ + test "$(id postgres)" = "uid=26(postgres) gid=26(postgres) groups=26(postgres)" && \ + mkdir -p /var/lib/pgsql/data && \ + /usr/libexec/fix-permissions /var/lib/pgsql && \ + /usr/libexec/fix-permissions /var/run/postgresql + +# Get prefix path and path to scripts rather than hard-code them in scripts +ENV CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/postgresql + +VOLUME ["/var/lib/pgsql/data"] + +USER 26 + +CMD ["run-postgresql"] diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..c635e5e --- /dev/null +++ b/Makefile @@ -0,0 +1,15 @@ +IMAGE_NAME = postgresql + +MODULEMDURL=file://postgresql.yaml + +default: run + +build: + docker build --tag=$(IMAGE_NAME) . + +run: build + docker run -d $(IMAGE_NAME) + +test: build + cd tests; MODULE=docker MODULEMD=$(MODULEMDURL) URL="docker=$(IMAGE_NAME)" make all + cd tests; MODULE=rpm MODULEMD=$(MODULEMDURL) URL="docker=$(IMAGE_NAME)" make all diff --git a/repos/fedora.repo b/repos/fedora.repo new file mode 100644 index 0000000..f86d71c --- /dev/null +++ b/repos/fedora.repo @@ -0,0 +1,5 @@ +[fedora] +name=fedora +baseurl=https://mirrors.nic.cz/fedora/linux/development/26/Everything/x86_64/os/ +enabled=0 + diff --git a/repos/postgresql.repo b/repos/postgresql.repo new file mode 100644 index 0000000..584b510 --- /dev/null +++ b/repos/postgresql.repo @@ -0,0 +1,4 @@ +[postgresql] +name=postgresql +baseurl=https://kojipkgs.fedoraproject.org/repos/module-5a0a295c9673c2a1/latest/x86_64/ +enabled=0 diff --git a/root/help.1 b/root/help.1 new file mode 100644 index 0000000..89c84d9 --- /dev/null +++ b/root/help.1 @@ -0,0 +1,190 @@ +.\"t +.\" WARNING: Do not edit this file manually, it is generated from README.md automatically. +.\" +.\"t +.\" Automatically generated by Pandoc 1.16.0.2 +.\" +.TH "POSTGRESQL\-95\-RHEL7" "1" "February 22, 2017" "Container Image Pages" "" +.hy +.SH PostgreSQL Docker image +.PP +This repository contains Dockerfiles for PostgreSQL images for general +usage and OpenShift. +Users can choose between RHEL and CentOS based images. +.SS Environment variables and volumes +.PP +The image recognizes the following environment variables that you can +set during initialization by passing \f[C]\-e\ VAR=VALUE\f[] to the +Docker run command. +.PP +.TS +tab(@); +lw(26.7n) lw(43.3n). +T{ +Variable name +T}@T{ +Description +T} +_ +T{ +\f[C]POSTGRESQL_USER\f[] +T}@T{ +User name for PostgreSQL account to be created +T} +T{ +\f[C]POSTGRESQL_PASSWORD\f[] +T}@T{ +Password for the user account +T} +T{ +\f[C]POSTGRESQL_DATABASE\f[] +T}@T{ +Database name +T} +T{ +\f[C]POSTGRESQL_ADMIN_PASSWORD\f[] +T}@T{ +Password for the \f[C]postgres\f[] admin account (optional) +T} +.TE +.PP +The following environment variables influence the PostgreSQL +configuration file. +They are all optional. +.PP +.TS +tab(@); +lw(15.7n) lw(37.6n) lw(16.7n). +T{ +Variable name +T}@T{ +Description +T}@T{ +Default +T} +_ +T{ +\f[C]POSTGRESQL_MAX_CONNECTIONS\f[] +T}@T{ +The maximum number of client connections allowed +T}@T{ +100 +T} +T{ +\f[C]POSTGRESQL_MAX_PREPARED_TRANSACTIONS\f[] +T}@T{ +Sets the maximum number of transactions that can be in the "prepared" +state. +If you are using prepared transactions, you will probably want this to +be at least as large as max_connections +T}@T{ +0 +T} +T{ +\f[C]POSTGRESQL_SHARED_BUFFERS\f[] +T}@T{ +Sets how much memory is dedicated to PostgreSQL to use for caching data +T}@T{ +32M +T} +T{ +\f[C]POSTGRESQL_EFFECTIVE_CACHE_SIZE\f[] +T}@T{ +Set to an estimate of how much memory is available for disk caching by +the operating system and within the database itself +T}@T{ +128M +T} +.TE +.PP +You can also set the following mount points by passing the +\f[C]\-v\ /host:/container\f[] flag to Docker. +.PP +.TS +tab(@); +l l. +T{ +Volume mount point +T}@T{ +Description +T} +_ +T{ +\f[C]/var/lib/pgsql/data\f[] +T}@T{ +PostgreSQL database cluster directory +T} +.TE +.PP +\f[B]Notice: When mouting a directory from the host into the container, +ensure that the mounted directory has the appropriate permissions and +that the owner and group of the directory matches the user UID or name +which is running inside the container.\f[] +.SS Usage +.PP +For this, we will assume that you are using the +\f[C]openshift/postgresql\-92\-centos7\f[] image. +If you want to set only the mandatory environment variables and not +store the database in a host directory, execute the following command: +.IP +.nf +\f[C] +$\ docker\ run\ \-d\ \-\-name\ postgresql_database\ \-e\ POSTGRESQL_USER=user\ \-e\ POSTGRESQL_PASSWORD=pass\ \-e\ POSTGRESQL_DATABASE=db\ \-p\ 5432:5432\ openshift/postgresql\-92\-centos7 +\f[] +.fi +.PP +This will create a container named \f[C]postgresql_database\f[] running +PostgreSQL with database \f[C]db\f[] and user with credentials +\f[C]user:pass\f[]. +Port 5432 will be exposed and mapped to the host. +If you want your database to be persistent across container executions, +also add a \f[C]\-v\ /host/db/path:/var/lib/pgsql/data\f[] argument. +This will be the PostgreSQL database cluster directory. +.PP +If the database cluster directory is not initialized, the entrypoint +script will first run +\f[C]initdb\f[] (http://www.postgresql.org/docs/9.2/static/app-initdb.html) +and setup necessary database users and passwords. +After the database is initialized, or if it was already present, +\f[C]postgres\f[] (http://www.postgresql.org/docs/9.2/static/app-postgres.html) +is executed and will run as PID 1. +You can stop the detached container by running +\f[C]docker\ stop\ postgresql_database\f[]. +.SS PostgreSQL auto\-tuning +.PP +When the PostgreSQL image is run with the \f[C]\-\-memory\f[] parameter +set and if there are no values provided for +\f[C]POSTGRESQL_SHARED_BUFFERS\f[] and +\f[C]POSTGRESQL_EFFECTIVE_CACHE_SIZE\f[] those values are automatically +calculated based on the value provided in the \f[C]\-\-memory\f[] +parameter. +.PP +The values are calculated based on the +upstream (https://wiki.postgresql.org/wiki/Tuning_Your_PostgreSQL_Server) +formulas. +For the \f[C]shared_buffers\f[] we use 1/4 of given memory and for the +\f[C]effective_cache_size\f[] we set the value to 1/2 of the given +memory. +.SS PostgreSQL admin account +.PP +The admin account \f[C]postgres\f[] has no password set by default, only +allowing local connections. +You can set it by setting the \f[C]POSTGRESQL_ADMIN_PASSWORD\f[] +environment variable when initializing your container. +This will allow you to login to the \f[C]postgres\f[] account remotely. +Local connections will still not require a password. +.SS Changing passwords +.PP +Since passwords are part of the image configuration, the only supported +method to change passwords for the database user +(\f[C]POSTGRESQL_USER\f[]) and \f[C]postgres\f[] admin user is by +changing the environment variables \f[C]POSTGRESQL_PASSWORD\f[] and +\f[C]POSTGRESQL_ADMIN_PASSWORD\f[], respectively. +.PP +Changing database passwords through SQL statements or any way other than +through the environment variables aforementioned will cause a mismatch +between the values stored in the variables and the actual passwords. +Whenever a database container starts it will reset the passwords to the +values stored in the environment variables. +.SH AUTHORS +Red Hat. diff --git a/root/usr/bin/cgroup-limits b/root/usr/bin/cgroup-limits new file mode 100755 index 0000000..b9d4edc --- /dev/null +++ b/root/usr/bin/cgroup-limits @@ -0,0 +1,92 @@ +#!/usr/bin/python + +""" +Script for parsing cgroup information + +This script will read some limits from the cgroup system and parse +them, printing out "VARIABLE=VALUE" on each line for every limit that is +successfully read. Output of this script can be directly fed into +bash's export command. Recommended usage from a bash script: + + set -o errexit + export_vars=$(cgroup-limits) ; export $export_vars + +Variables currently supported: + MAX_MEMORY_LIMIT_IN_BYTES + Maximum possible limit MEMORY_LIMIT_IN_BYTES can have. This is + currently constant value of 9223372036854775807. + MEMORY_LIMIT_IN_BYTES + Maximum amount of user memory in bytes. If this value is set + to the same value as MAX_MEMORY_LIMIT_IN_BYTES, it means that + there is no limit set. The value is taken from + /sys/fs/cgroup/memory/memory.limit_in_bytes + NUMBER_OF_CORES + Number of detected CPU cores that can be used. This value is + calculated from /sys/fs/cgroup/cpuset/cpuset.cpus + NO_MEMORY_LIMIT + Set to "true" if MEMORY_LIMIT_IN_BYTES is so high that the caller + can act as if no memory limit was set. Undefined otherwise. +""" + +from __future__ import print_function +import sys + + +def _read_file(path): + try: + with open(path, 'r') as f: + return f.read().strip() + except IOError: + return None + + +def get_memory_limit(): + """ + Read memory limit, in bytes. + """ + + limit = _read_file('/sys/fs/cgroup/memory/memory.limit_in_bytes') + if limit is None or not limit.isdigit(): + print("Warning: Can't detect memory limit from cgroups", + file=sys.stderr) + return None + return int(limit) + + +def get_number_of_cores(): + """ + Read number of CPU cores. + """ + + core_count = 0 + + line = _read_file('/sys/fs/cgroup/cpuset/cpuset.cpus') + if line is None: + print("Warning: Can't detect number of CPU cores from cgroups", + file=sys.stderr) + return None + + for group in line.split(','): + core_ids = list(map(int, group.split('-'))) + if len(core_ids) == 2: + core_count += core_ids[1] - core_ids[0] + 1 + else: + core_count += 1 + + return core_count + + +if __name__ == "__main__": + env_vars = { + "MAX_MEMORY_LIMIT_IN_BYTES": 9223372036854775807, + "MEMORY_LIMIT_IN_BYTES": get_memory_limit(), + "NUMBER_OF_CORES": get_number_of_cores() + } + + env_vars = {k: v for k, v in env_vars.items() if v is not None} + + if env_vars.get("MEMORY_LIMIT_IN_BYTES", 0) >= 92233720368547: + env_vars["NO_MEMORY_LIMIT"] = "true" + + for key, value in env_vars.items(): + print("{0}={1}".format(key, value)) diff --git a/root/usr/bin/container-entrypoint b/root/usr/bin/container-entrypoint new file mode 100755 index 0000000..5fc4448 --- /dev/null +++ b/root/usr/bin/container-entrypoint @@ -0,0 +1,3 @@ +#!/bin/bash + +exec "$@" diff --git a/root/usr/bin/run-postgresql b/root/usr/bin/run-postgresql new file mode 100755 index 0000000..1c8de78 --- /dev/null +++ b/root/usr/bin/run-postgresql @@ -0,0 +1,28 @@ +#!/bin/bash + +export ENABLE_REPLICATION=${ENABLE_REPLICATION:-false} + +set -eu +export_vars=$(cgroup-limits) ; export $export_vars + +source "${CONTAINER_SCRIPTS_PATH}/common.sh" + +set_pgdata +check_env_vars +generate_passwd_file +generate_postgresql_config + +if [ ! -f "$PGDATA/postgresql.conf" ]; then + initialize_database + NEED_TO_CREATE_USERS=yes +fi + +pg_ctl -w start -o "-h ''" +if [ "${NEED_TO_CREATE_USERS:-}" == "yes" ]; then + create_users +fi +set_passwords +pg_ctl stop + +unset_env_vars +exec postgres "$@" diff --git a/root/usr/bin/run-postgresql-master b/root/usr/bin/run-postgresql-master new file mode 100755 index 0000000..79e7cc2 --- /dev/null +++ b/root/usr/bin/run-postgresql-master @@ -0,0 +1,5 @@ +#!/bin/bash + +export ENABLE_REPLICATION=true + +exec run-postgresql "$@" diff --git a/root/usr/bin/run-postgresql-slave b/root/usr/bin/run-postgresql-slave new file mode 100755 index 0000000..5d42d0d --- /dev/null +++ b/root/usr/bin/run-postgresql-slave @@ -0,0 +1,36 @@ +#!/bin/bash + +export ENABLE_REPLICATION=true + +set -eu +export_vars=$(cgroup-limits) ; export $export_vars + +source "$CONTAINER_SCRIPTS_PATH"/common.sh + +set_pgdata + +function initialize_replica() { + echo "Initializing PostgreSQL slave ..." + # TODO: Validate and reuse existing data? + rm -rf $PGDATA + PGPASSWORD="${POSTGRESQL_MASTER_PASSWORD}" pg_basebackup -x --no-password --pgdata ${PGDATA} --host=${MASTER_FQDN} --port=5432 -U "${POSTGRESQL_MASTER_USER}" + + # PostgreSQL recovery configuration. + generate_postgresql_recovery_config + cat >> "$PGDATA/recovery.conf" <&2 "error: $1" + fi + + cat >&2 </dev/null) + # FIXME: This is for debugging (docker run) + if [ -v POSTGRESQL_MASTER_IP ]; then + endpoints=${POSTGRESQL_MASTER_IP:-} + fi + if [ -z "$endpoints" ]; then + >&2 echo "Failed to resolve PostgreSQL master IP address" + exit 3 + fi + echo -n "$(echo $endpoints | cut -d ' ' -f 1)" +} + +# New config is generated every time a container is created. It only contains +# additional custom settings and is included from $PGDATA/postgresql.conf. +function generate_postgresql_config() { + envsubst \ + < "${CONTAINER_SCRIPTS_PATH}/openshift-custom-postgresql.conf.template" \ + > "${POSTGRESQL_CONFIG_FILE}" + + if [ "${ENABLE_REPLICATION}" == "true" ]; then + envsubst \ + < "${CONTAINER_SCRIPTS_PATH}/openshift-custom-postgresql-replication.conf.template" \ + >> "${POSTGRESQL_CONFIG_FILE}" + fi +} + +function generate_postgresql_recovery_config() { + envsubst \ + < "${CONTAINER_SCRIPTS_PATH}/openshift-custom-recovery.conf.template" \ + > "${POSTGRESQL_RECOVERY_FILE}" +} + +# Generate passwd file based on current uid +function generate_passwd_file() { + export USER_ID=$(id -u) + export GROUP_ID=$(id -g) + grep -v ^postgres /etc/passwd > "$HOME/passwd" + echo "postgres:x:${USER_ID}:${GROUP_ID}:PostgreSQL Server:${HOME}:/bin/bash" >> "$HOME/passwd" + export LD_PRELOAD=libnss_wrapper.so + export NSS_WRAPPER_PASSWD=${HOME}/passwd + export NSS_WRAPPER_GROUP=/etc/group +} + +function initialize_database() { + # Initialize the database cluster with utf8 support enabled by default. + # This might affect performance, see: + # http://www.postgresql.org/docs/9.5/static/locale.html + LANG=${LANG:-en_US.utf8} initdb + + # PostgreSQL configuration. + cat >> "$PGDATA/postgresql.conf" <> "$PGDATA/pg_hba.conf" < +# + +from avocado import main +from moduleframework import module_framework + + +class ExampleRpmValidation(module_framework.AvocadoTest): + """ + :avocado: enable + """ + fhs_base_paths = [ + '/bin', + '/boot', + '/dev', + '/etc', + '/home', + '/lib', + '/lib64', + '/media', + '/mnt', + '/opt', + '/proc', + '/root', + '/run', + '/sbin', + '/sys', + '/srv', + '/tmp', + '/usr/bin' + ] + + def testPaths(self): + self.start() + for directory in self.fhs_base_paths: + self.run("test -d %s" % directory) diff --git a/tests/sanity1.py b/tests/sanity1.py new file mode 100644 index 0000000..677abff --- /dev/null +++ b/tests/sanity1.py @@ -0,0 +1,46 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +# +# This Modularity Testing Framework helps you to write tests for modules +# Copyright (C) 2017 Red Hat, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# he Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Authors: Rado Pitonak +# + +from avocado import main +from avocado.core import exceptions +from moduleframework import module_framework + + +class SanityCheck1(module_framework.AvocadoTest): + """ + :avocado: enable + """ + + def test1(self): + self.start() + self.run("ls / | grep bin") + + # check if perl is installed in the right version. + def test2PostgresVersion(self): + postgresVersion = "9.6" + self.start() + self.run("postgres --version | grep " + postgresVersion) + + +if __name__ == '__main__': + main() diff --git a/tests/sanity2.py b/tests/sanity2.py new file mode 100644 index 0000000..a6bee42 --- /dev/null +++ b/tests/sanity2.py @@ -0,0 +1,47 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +# +# This Modularity Testing Framework helps you to write tests for modules +# Copyright (C) 2017 Red Hat, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# he Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Authors: Rado Pitonak +# + +from avocado import main +from avocado.core import exceptions +from moduleframework import module_framework +import time + + +class SanityCheck2(module_framework.AvocadoTest): + """ + :avocado: enable + """ + + def testConnectToDB(self): + self.start() + time.sleep(5) + self.run("psql -U $POSTGRESQL_USER -d $POSTGRESQL_DATABASE -c 'SELECT 1'") + + def testCreateTable(self): + self.start() + time.sleep(5) + self.run("psql -U $POSTGRESQL_USER -d $POSTGRESQL_DATABASE -c 'CREATE TABLE mytable(ID INT PRIMARY KEY NOT NULL);'") + + +if __name__ == '__main__': + main() diff --git a/tests/simpleTest.py b/tests/simpleTest.py new file mode 100644 index 0000000..780e387 --- /dev/null +++ b/tests/simpleTest.py @@ -0,0 +1,47 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +# +# This Modularity Testing Framework helps you to write tests for modules +# Copyright (C) 2017 Red Hat, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# he Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Authors: Jan Scotka +# + +from moduleframework import module_framework +import os + + +class simpleTests(module_framework.AvocadoTest): + """ + :avocado: enable + """ + + def testPath(self): + print ">>>>>>>>>>>>>> ", module_framework.__file__ + print ">>>>>>>>>>>>>> ", __file__ + + def testAssertIn(self): + self.start() + self.assertIn("sbin", self.run("ls /").stdout) + + def testInsideModule(self): + self.start() + self.assertEqual("a", self.run("echo a").stdout.strip()) + + def testCommandOnHost(self): + self.start() + self.assertEqual("a", self.runHost("echo a").stdout.strip()) From 0603455e67820227129fe5fa8db4f2ff32904ca5 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Fri, 25 Aug 2017 10:34:51 +0200 Subject: [PATCH 08/23] import modulemd generated by dependency-report --- postgresql.yaml | 77 ++++++++++++++----------------------------------- 1 file changed, 22 insertions(+), 55 deletions(-) diff --git a/postgresql.yaml b/postgresql.yaml index 73d78c5..36e1375 100644 --- a/postgresql.yaml +++ b/postgresql.yaml @@ -1,58 +1,25 @@ document: modulemd version: 1 data: - # name, stream, version are filled in by the build system - #name: "" - #stream: "" - #version: 0 - summary: 'The programs needed to create and run a PostgreSQL server' - description: |- - PostgreSQL is an advanced Object-Relational database management system - (DBMS). The postgresql-server package contains the programs needed to - create and run a PostgreSQL server, which will in turn allow you to create - and maintain PostgreSQL databases. - license: - module: - - MIT - content: - - PostgreSQL - dependencies: - buildrequires: - base-runtime: master - common-build-dependencies: f26 - common-build-dependencies-bootstrap: f26 - shared-userspace: f26 - perl: master - requires: - base-runtime: master - perl: master - api: - rpms: - - postgresql - profiles: - default: - rpms: - - postgresql-server - client: - rpms: - - postgresql - filter: {} - components: - rpms: - # part of common-build-dependencies: - # multilib-rpm-config, gettext - postgresql: - rationale: 'Build dependency (for postgresql-contrib).' - ref: f26 - buildorder: 10 - uuid: - rationale: 'Build dependency (for postgresql-contrib).' - ref: f26 - buildorder: 1 - perl-Data-UUID: - rationale: 'Build dependency (for postgresql-contrib).' - ref: f26 - elinks: - rationale: 'Build dependency (for postgresql-contrib).' - ref: private-f27-modules - buildorder: 3 + summary: postgresql module + description: This postgresql has been generated + license: + module: [ MIT ] + dependencies: + buildrequires: + bootstrap: master + requires: + platform: master + platform-placeholder: master + references: + community: https://docs.pagure.org/modularity/ + documentation: https://github.com/modularity-modules/postgresql + tracker: https://github.com/modularity-modules/postgresql + components: + rpms: + postgresql: + rationale: Generated. + ref: master. + uuid: + rationale: Generated. + ref: master. From 6cdab777aa5ae36faab6b9f74f4b2deb3c4b315a Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Fri, 25 Aug 2017 10:40:55 +0200 Subject: [PATCH 09/23] reindent --- postgresql.yaml | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/postgresql.yaml b/postgresql.yaml index 36e1375..674facc 100644 --- a/postgresql.yaml +++ b/postgresql.yaml @@ -1,25 +1,25 @@ document: modulemd version: 1 data: - summary: postgresql module - description: This postgresql has been generated - license: - module: [ MIT ] - dependencies: - buildrequires: - bootstrap: master - requires: - platform: master - platform-placeholder: master - references: - community: https://docs.pagure.org/modularity/ - documentation: https://github.com/modularity-modules/postgresql - tracker: https://github.com/modularity-modules/postgresql - components: - rpms: - postgresql: - rationale: Generated. - ref: master. - uuid: - rationale: Generated. - ref: master. + summary: postgresql module + description: This postgresql has been generated + license: + module: [ MIT ] + dependencies: + buildrequires: + bootstrap: master + requires: + platform: master + platform-placeholder: master + references: + community: https://docs.pagure.org/modularity/ + documentation: https://github.com/modularity-modules/postgresql + tracker: https://github.com/modularity-modules/postgresql + components: + rpms: + postgresql: + rationale: Generated. + ref: master. + uuid: + rationale: Generated. + ref: master. From e090c6f0fe81f337460a81e1350b4083fcecbbb5 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Fri, 25 Aug 2017 10:41:03 +0200 Subject: [PATCH 10/23] re-add api, profiles --- postgresql.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/postgresql.yaml b/postgresql.yaml index 674facc..4f3a479 100644 --- a/postgresql.yaml +++ b/postgresql.yaml @@ -15,6 +15,17 @@ data: community: https://docs.pagure.org/modularity/ documentation: https://github.com/modularity-modules/postgresql tracker: https://github.com/modularity-modules/postgresql + api: + rpms: + - postgresql + profiles: + default: + rpms: + - postgresql-server + client: + rpms: + - postgresql + filter: {} components: rpms: postgresql: From 83452c25e6c4dfaeccbbc02d7dca1713bdb95272 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Fri, 25 Aug 2017 10:46:24 +0200 Subject: [PATCH 11/23] reindent again (grrr, tabs) --- postgresql.yaml | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/postgresql.yaml b/postgresql.yaml index 4f3a479..23dea4d 100644 --- a/postgresql.yaml +++ b/postgresql.yaml @@ -1,20 +1,20 @@ document: modulemd version: 1 data: - summary: postgresql module - description: This postgresql has been generated - license: - module: [ MIT ] - dependencies: - buildrequires: - bootstrap: master - requires: - platform: master - platform-placeholder: master - references: - community: https://docs.pagure.org/modularity/ - documentation: https://github.com/modularity-modules/postgresql - tracker: https://github.com/modularity-modules/postgresql + summary: postgresql module + description: This postgresql has been generated + license: + module: [ MIT ] + dependencies: + buildrequires: + bootstrap: master + requires: + platform: master + platform-placeholder: master + references: + community: https://docs.pagure.org/modularity/ + documentation: https://github.com/modularity-modules/postgresql + tracker: https://github.com/modularity-modules/postgresql api: rpms: - postgresql @@ -28,9 +28,9 @@ data: filter: {} components: rpms: - postgresql: - rationale: Generated. - ref: master. - uuid: - rationale: Generated. - ref: master. + postgresql: + rationale: Generated. + ref: master. + uuid: + rationale: Generated. + ref: master. From a61016ef1a60e8108169be42ce07e614bb7b974d Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Fri, 25 Aug 2017 10:53:50 +0200 Subject: [PATCH 12/23] make the description a proper sentence --- postgresql.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/postgresql.yaml b/postgresql.yaml index 23dea4d..6f7e490 100644 --- a/postgresql.yaml +++ b/postgresql.yaml @@ -2,7 +2,7 @@ document: modulemd version: 1 data: summary: postgresql module - description: This postgresql has been generated + description: This postgresql module has been generated. license: module: [ MIT ] dependencies: From e26462750c73da621183a1e345a237063ef150ee Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Fri, 25 Aug 2017 10:54:54 +0200 Subject: [PATCH 13/23] pull component packages from f27 --- postgresql.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/postgresql.yaml b/postgresql.yaml index 6f7e490..df1dc5d 100644 --- a/postgresql.yaml +++ b/postgresql.yaml @@ -30,7 +30,7 @@ data: rpms: postgresql: rationale: Generated. - ref: master. + ref: f27 uuid: rationale: Generated. - ref: master. + ref: f27 From 74b97eac49c324896948d188cf7790f2aa2da82a Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Fri, 25 Aug 2017 12:47:05 +0200 Subject: [PATCH 14/23] remove bogus platform-placeholder dependency --- postgresql.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/postgresql.yaml b/postgresql.yaml index df1dc5d..48a8832 100644 --- a/postgresql.yaml +++ b/postgresql.yaml @@ -10,7 +10,6 @@ data: bootstrap: master requires: platform: master - platform-placeholder: master references: community: https://docs.pagure.org/modularity/ documentation: https://github.com/modularity-modules/postgresql From 71e7d7e4174d189a351299a87291b2e79f4e1cfc Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Mon, 9 Oct 2017 16:07:25 +0200 Subject: [PATCH 15/23] provide server profile as requested by sct --- postgresql.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/postgresql.yaml b/postgresql.yaml index 48a8832..29792f2 100644 --- a/postgresql.yaml +++ b/postgresql.yaml @@ -21,6 +21,9 @@ data: default: rpms: - postgresql-server + server: + rpms: + - postgresql-server client: rpms: - postgresql From fce1b50a7ad4a741d65b5989abbd9c3fd1cf64d6 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Thu, 12 Oct 2017 11:16:44 +0200 Subject: [PATCH 16/23] bump and rebuild From de62aeaeb5bd4902f53a2aa8d13d0342a63687ba Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Thu, 12 Oct 2017 11:50:28 +0200 Subject: [PATCH 17/23] bump From 5d9488e1439f5e5b4f272961ceed4b4965f8bde2 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Thu, 12 Oct 2017 11:55:55 +0200 Subject: [PATCH 18/23] use older hast for mbs/pdc sync tests --- postgresql.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/postgresql.yaml b/postgresql.yaml index 29792f2..653cd24 100644 --- a/postgresql.yaml +++ b/postgresql.yaml @@ -32,7 +32,7 @@ data: rpms: postgresql: rationale: Generated. - ref: f27 + ref: 1fa73e0a7b04e79c7ba7c4fddeee422d27634884 uuid: rationale: Generated. ref: f27 From 8adcc7910fd09c315dde251242010be57d59c395 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Thu, 12 Oct 2017 12:00:54 +0200 Subject: [PATCH 19/23] use an even older hash for mbs/pdc sync tests --- postgresql.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/postgresql.yaml b/postgresql.yaml index 653cd24..c4516dd 100644 --- a/postgresql.yaml +++ b/postgresql.yaml @@ -32,7 +32,7 @@ data: rpms: postgresql: rationale: Generated. - ref: 1fa73e0a7b04e79c7ba7c4fddeee422d27634884 + ref: 61feab0edf0880151e44d388400caea6522067cf uuid: rationale: Generated. ref: f27 From e733195a45298ed48abc58a805e4be97390030e3 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Thu, 12 Oct 2017 13:13:27 +0200 Subject: [PATCH 20/23] Revert "use an even older hash for mbs/pdc sync tests" This reverts commit 8adcc7910fd09c315dde251242010be57d59c395. --- postgresql.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/postgresql.yaml b/postgresql.yaml index c4516dd..653cd24 100644 --- a/postgresql.yaml +++ b/postgresql.yaml @@ -32,7 +32,7 @@ data: rpms: postgresql: rationale: Generated. - ref: 61feab0edf0880151e44d388400caea6522067cf + ref: 1fa73e0a7b04e79c7ba7c4fddeee422d27634884 uuid: rationale: Generated. ref: f27 From 7541816442f847c2f69c19cb40416aa31d62208d Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Thu, 12 Oct 2017 13:14:15 +0200 Subject: [PATCH 21/23] Revert "use older hast for mbs/pdc sync tests" This reverts commit 5d9488e1439f5e5b4f272961ceed4b4965f8bde2. --- postgresql.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/postgresql.yaml b/postgresql.yaml index 653cd24..29792f2 100644 --- a/postgresql.yaml +++ b/postgresql.yaml @@ -32,7 +32,7 @@ data: rpms: postgresql: rationale: Generated. - ref: 1fa73e0a7b04e79c7ba7c4fddeee422d27634884 + ref: f27 uuid: rationale: Generated. ref: f27 From b8b9571938ed41b303d600f2eb7df9f5219faf06 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Wed, 18 Oct 2017 10:35:30 +0200 Subject: [PATCH 22/23] switch to f27 stream requirements --- postgresql.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/postgresql.yaml b/postgresql.yaml index 29792f2..0dfdb12 100644 --- a/postgresql.yaml +++ b/postgresql.yaml @@ -7,9 +7,9 @@ data: module: [ MIT ] dependencies: buildrequires: - bootstrap: master + bootstrap: f27 requires: - platform: master + platform: f27 references: community: https://docs.pagure.org/modularity/ documentation: https://github.com/modularity-modules/postgresql From 0afe31547e9e4c15269286d79038d8bcfee4a460 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Fri, 20 Oct 2017 12:44:21 +0200 Subject: [PATCH 23/23] update master hashes --- postgresql.yaml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/postgresql.yaml b/postgresql.yaml index 0dfdb12..fa4ff16 100644 --- a/postgresql.yaml +++ b/postgresql.yaml @@ -7,9 +7,9 @@ data: module: [ MIT ] dependencies: buildrequires: - bootstrap: f27 + bootstrap: master requires: - platform: f27 + platform: master references: community: https://docs.pagure.org/modularity/ documentation: https://github.com/modularity-modules/postgresql @@ -30,9 +30,12 @@ data: filter: {} components: rpms: + # postgresql-10.0-3.fc28 postgresql: rationale: Generated. - ref: f27 + ref: 07894e0da4b994092abd0084fba982e075ccf3f3 + # uuid-1.6.2-39.fc27 uuid: rationale: Generated. - ref: f27 + ref: 43c916caff937bdf8a97ded1abff3e01df4895f4 +