From 8236d32e16231325b58777dd0c2ebc116f895103 Mon Sep 17 00:00:00 2001 From: Paul McGoldrick Date: Thu, 28 Sep 2017 10:03:55 -0700 Subject: initial seed code commit VVP-10 Change-Id: I2a86f5759b330aa7ca8009055d345ec9b3d6d08a Signed-off-by: Paul McGoldrick --- Dockerfile | 89 ++++++++++++++++++++++++++ LICENSE.TXT | 38 ++++++++++++ ensure-postgresql-upgrade.sh | 144 +++++++++++++++++++++++++++++++++++++++++++ pom.xml | 122 ++++++++++++++++++++++++++++++++++++ tox.ini | 19 ++++++ 5 files changed, 412 insertions(+) create mode 100755 Dockerfile create mode 100755 LICENSE.TXT create mode 100755 ensure-postgresql-upgrade.sh create mode 100755 pom.xml create mode 100755 tox.ini diff --git a/Dockerfile b/Dockerfile new file mode 100755 index 0000000..14428e4 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,89 @@ +# ============LICENSE_START========================================== +# org.onap.vvp/postgresql +# =================================================================== +# Copyright © 2017 AT&T Intellectual Property. All rights reserved. +# =================================================================== +# +# Unless otherwise specified, all software contained herein is licensed +# under the Apache License, Version 2.0 (the “License”); +# you may not use this software except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# 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. +# +# +# +# Unless otherwise specified, all documentation contained herein is licensed +# under the Creative Commons License, Attribution 4.0 Intl. (the “License”); +# you may not use this documentation except in compliance with the License. +# You may obtain a copy of the License at +# +# https://creativecommons.org/licenses/by/4.0/ +# +# Unless required by applicable law or agreed to in writing, documentation +# distributed under the License is distributed on an "AS IS" BASIS, +# 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. +# +# ============LICENSE_END============================================ +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. +FROM postgres:9.6 + +# Postgres upgrader container +# +# Prior to this container, we ran an Alpine Linux container with Alpine's +# packaged PostgreSQL 9.4 +# +# PostgreSQL 9.5 and above will not read data files written by PostgreSQL 9.4; +# a migration must be performed. +# +# We found it difficult to update to a more recent version of Alpine Linux, +# because doing so would bring along a major-version update of PostgreSQL. +# +# One way to migrate a PostgreSQL database is to use pg_dump, transferring +# files, and pg_restore, maybe while juggling containers. +# +# We want to use pg_upgrade with link mode to migrate from 9.4 to 9.6, because +# - it is "much faster and will use less disk space." +# - we don't at present have replication or zero-downtime deploys so a small +# maintenance window is acceptable and expected +# - the deploy process should be as simple as updating the container twice +# https://www.postgresql.org/docs/9.6/static/pgupgrade.html +# +# pg_upgrade requires the postgresql binaries be installed for both the new +# version and the old version of the cluster. +# +# PostgreSQL9.6 is not available as package for the Alpine version we're using. +# +# Upstream's -alpine docker containers compile postgres during the docker +# build, but their standard containers just apt-get install from a Debian +# repository. The repository contains packages for many postgresql versions, +# which will co-exist happily in the same system (container). +# +# So, during the upgrade, we use the debian-based container. After the +# migration is successful, we will switch to the Alpine-based container running +# the same version of PostgreSQL. +# + +# Install the old version of postgres +RUN apt-get update \ + && apt-get install -y postgresql-9.4 postgresql-contrib-9.4 \ + && rm -rf /var/lib/apt/lists/* + +# Docker will call docker-entrypoint.sh with these arguments. +# docker-entrypoint.sh only performs database initialization when its first +# argument is 'postgres', then it execs its arguments. So, our upgrade script +# will perform the upgrade if necessary, then exec docker-entrypoint.sh with +# its argument, 'postgres', and startup should continue as normal. This also +# means that if the container is launched with a different "command" it will +# replace our custom stuff, as a user might expect. +COPY ensure-postgresql-upgrade.sh /usr/local/bin +CMD ["ensure-postgresql-upgrade.sh", "postgres"] diff --git a/LICENSE.TXT b/LICENSE.TXT new file mode 100755 index 0000000..4202e45 --- /dev/null +++ b/LICENSE.TXT @@ -0,0 +1,38 @@ +# +# ============LICENSE_START========================================== +# org.onap.vvp/postgresql +# =================================================================== +# Copyright © 2017 AT&T Intellectual Property. All rights reserved. +# =================================================================== +# +# Unless otherwise specified, all software contained herein is licensed +# under the Apache License, Version 2.0 (the “License”); +# you may not use this software except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# 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. +# +# +# +# Unless otherwise specified, all documentation contained herein is licensed +# under the Creative Commons License, Attribution 4.0 Intl. (the “License”); +# you may not use this documentation except in compliance with the License. +# You may obtain a copy of the License at +# +# https://creativecommons.org/licenses/by/4.0/ +# +# Unless required by applicable law or agreed to in writing, documentation +# distributed under the License is distributed on an "AS IS" BASIS, +# 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. +# +# ============LICENSE_END============================================ +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. diff --git a/ensure-postgresql-upgrade.sh b/ensure-postgresql-upgrade.sh new file mode 100755 index 0000000..0d68350 --- /dev/null +++ b/ensure-postgresql-upgrade.sh @@ -0,0 +1,144 @@ +#!/bin/sh +# ============LICENSE_START========================================== +# org.onap.vvp/postgresql +# =================================================================== +# Copyright © 2017 AT&T Intellectual Property. All rights reserved. +# =================================================================== +# +# Unless otherwise specified, all software contained herein is licensed +# under the Apache License, Version 2.0 (the “License”); +# you may not use this software except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# 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. +# +# +# +# Unless otherwise specified, all documentation contained herein is licensed +# under the Creative Commons License, Attribution 4.0 Intl. (the “License”); +# you may not use this documentation except in compliance with the License. +# You may obtain a copy of the License at +# +# https://creativecommons.org/licenses/by/4.0/ +# +# Unless required by applicable law or agreed to in writing, documentation +# distributed under the License is distributed on an "AS IS" BASIS, +# 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. +# +# ============LICENSE_END============================================ +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. + +set -ex + +# This file will be launched with the command: +# +# docker-entrypoint.sh ensure-postgresql-upgrade.sh postgres +# +# It will perform a postgresql upgrade if needed, then launch postgres as +# usual. + +# +# See if cluster needs upgrade +# + +if [ -e "$PGDATA/PG_VERSION" ]; then + orig_cluster_version="$(head -1 "$PGDATA/PG_VERSION")" +else + orig_cluster_version= +fi + +if [ ! "$orig_cluster_version" ] || \ + [ "${PG_VERSION#$orig_cluster_version}" != "${PG_VERSION}" ] +then + # Cluster version is the same as container version; no upgrade needed. + exec docker-entrypoint.sh "$@" +fi + +echo >&2 "PostgreSQL version in this container is $PG_VERSION" +echo >&2 "PostgreSQL data was written by version $orig_cluster_version" +echo >&2 "Cluster upgrade will be performed..." + + +# +# Move old cluster +# + +# Since we typically mount a volume at $PGDATA, and we want to avoid crossing +# filesystems, we move the old data to a directory within itself. We take +# advantage here of the fact that there should be no preexisting dot-directores +# and '*' skips them. +mkdir "$PGDATA/.old" +mv "$PGDATA"/* "$PGDATA/.old/" +mv "$PGDATA/.old" "$PGDATA/old" +# If a different container created the old cluster, then their postgres might +# have a different uid than ours. Just in case, recursively chown all the +# postgres data. +chown -Rc postgres.postgres "$PGDATA" +chmod =,u=rwX "$PGDATA/old" + +# +# Initialize new cluster +# + +# We can't just launch 'docker-entrypoint.sh postgres' here because that will +# stand up more than an empty cluster, which causes problems for pg_upgrade. + +PGDATA="$PGDATA/new" gosu postgres initdb + +# +# Adjust authentication +# + +# The new cluster's auth will be trust by default. +# We don't necessarily know what the old one was. +# Make the old one "peer" then later migrate the old one's original settings to +# the new. +mv "$PGDATA/old/pg_hba.conf" "$PGDATA/old/pg_hba.conf.bak" +echo "local all all peer" > "$PGDATA/old/pg_hba.conf" +chown postgres "$PGDATA/new/pg_hba.conf" + +# +# Run pg_upgrade +# + +cd /tmp # so it can write its log + +gosu postgres pg_upgrade \ + --old-datadir "$PGDATA/old" \ + --old-bindir "/usr/lib/postgresql/$orig_cluster_version/bin/" \ + --new-datadir "$PGDATA/new" \ + --new-bindir "/usr/lib/postgresql/$PG_MAJOR/bin/" + +# +# Restore pg_hba.conf +# +mv "$PGDATA/old/pg_hba.conf.bak" "$PGDATA/new/pg_hba.conf" + +# +# Apply old configuration to new +# +cp -d "$PGDATA/old/postgresql.conf" "$PGDATA/new/" + +# +# Delete old cluster; move new into place. +# + +rm -rf "$PGDATA/old" +mv "$PGDATA/new"/* "$PGDATA" +rmdir "$PGDATA/new" + +# +# Start new cluster +# + +echo >&2 "Database upgrade complete; launching 'docker-entrypoint.sh ""$@""'" +exec docker-entrypoint.sh "$@" diff --git a/pom.xml b/pom.xml new file mode 100755 index 0000000..3c2109a --- /dev/null +++ b/pom.xml @@ -0,0 +1,122 @@ + + 4.0.0 + + org.onap.oparent + oparent + 1.0.0-SNAPSHOT + + + org.openecomp.vvp + vvp-postgresql + pom + 1.0.0-SNAPSHOT + vvp-postgresql + + + + /content/sites/site/org/openecomp/vvp/${project.artifactId}/${project.version} + + ${maven.build.timestamp} + yyyy.MM.dd.HH.mm + + ${project.version}-${timestamp} + ${project.version}-latest + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.7 + true + + ${onap.nexus.url} + 176c31dfe190a + ecomp-staging + + + + io.fabric8 + docker-maven-plugin + 0.19.1 + + true + 1.23 + nexus3.onap.org:10003 + + + openecomp/vvp-postgresql + vvp-postgresql + + true + + ${docker.tag} + ${docker.latest.tag} + + ${project.basedir} + + + + + + + clean-images + pre-clean + + remove + + + true + + + + + generate-images + package + + build + + + + + push-images + deploy + + build + push + + + openecomp/vvp-postgresql + + + + + + + + + ecomp-site + dav:${onap.nexus.url}${sitePath} + + + + + ecomp-releases + ECOMP Release Repository + ${onap.nexus.url}/content/repositories/releases/ + + + ecomp-snapshots + ECOMP Snapshot Repository + ${onap.nexus.url}/content/repositories/snapshots/ + + + ecomp-staging + ECOMP Staging Repository + ${onap.nexus.url}/content/repositories/staging/ + + + + diff --git a/tox.ini b/tox.ini new file mode 100755 index 0000000..d3ba96e --- /dev/null +++ b/tox.ini @@ -0,0 +1,19 @@ +[tox] +skipsdist=True +envlist = py27,py3,style +setupdir = postgresql + +[testenv] +distribute = False +commands = + {envpython} --version +deps = flake8 + +[testenv:style] +commands = flake8 + +[testenv:py27] +basepython=python2.7 + +[testenv:py3] +basepython=python3.6 -- cgit 1.2.3-korg