Bitnami/containers
2
0
Fork 0
mirror of https://github.com/bitnami/containers.git synced 2026-03-12 06:48:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

replace use of gosu with s6-setuidgid

Browse Source
This commit is contained in:
Sameer Naik
2015-10-01 22:15:00 +05:30
parent 32c3bd6a3e
commit 0612aebc66
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bitnami/postgresql/post-install.sh
View File

@@ -3,7 +3,7 @@ cd $BITNAMI_APP_DIR
# set up default configs
mkdir conf.defaults
gosu $BITNAMI_APP_USER $BITNAMI_APP_DIR/bin/initdb -D $BITNAMI_APP_DIR/data \
s6-setuidgid $BITNAMI_APP_USER $BITNAMI_APP_DIR/bin/initdb -D $BITNAMI_APP_DIR/data \
-U $BITNAMI_APP_USER -E unicode -A trust >/dev/null
mv $BITNAMI_APP_DIR/data/postgresql.conf conf.defaults/
mv $BITNAMI_APP_DIR/data/pg_hba.conf conf.defaults/

10
bitnami/postgresql/rootfs/bitnami-utils-custom.sh
View File

@@ -5,7 +5,7 @@ initialize_database() {
echo "==> Initializing PostgreSQL database..."
echo ""
chown -R $BITNAMI_APP_USER:$BITNAMI_APP_USER $BITNAMI_APP_DIR/data $BITNAMI_APP_DIR/conf
gosu $BITNAMI_APP_USER $BITNAMI_APP_DIR/bin/initdb -D $BITNAMI_APP_DIR/data \
s6-setuidgid $BITNAMI_APP_USER $BITNAMI_APP_DIR/bin/initdb -D $BITNAMI_APP_DIR/data \
-U $BITNAMI_APP_USER -E unicode -A trust >/dev/null
# remove the config files generated by initdb
@@ -17,7 +17,7 @@ create_custom_database() {
echo "==> Creating database $POSTGRESQL_DATABASE..."
echo ""
echo "CREATE DATABASE $POSTGRESQL_DATABASE;" | \
gosu $BITNAMI_APP_USER $BITNAMI_APP_DIR/bin/postgres --single $PROGRAM_OPTIONS >/dev/null
s6-setuidgid $BITNAMI_APP_USER $BITNAMI_APP_DIR/bin/postgres --single $PROGRAM_OPTIONS >/dev/null
fi
}
@@ -35,17 +35,17 @@ create_postgresql_user() {
if [ "$POSTGRESQL_USER" = postgres ]; then
echo "==> Creating postgres user with unrestricted access..."
echo "ALTER ROLE $POSTGRESQL_USER WITH PASSWORD '$POSTGRESQL_PASSWORD';" | \
gosu $BITNAMI_APP_USER $BITNAMI_APP_DIR/bin/postgres --single $PROGRAM_OPTIONS >/dev/null
s6-setuidgid $BITNAMI_APP_USER $BITNAMI_APP_DIR/bin/postgres --single $PROGRAM_OPTIONS >/dev/null
else
echo "==> Creating user $POSTGRESQL_USER..."
echo ""
echo "CREATE ROLE $POSTGRESQL_USER WITH LOGIN CREATEDB PASSWORD '$POSTGRESQL_PASSWORD';" | \
gosu $BITNAMI_APP_USER $BITNAMI_APP_DIR/bin/postgres --single $PROGRAM_OPTIONS >/dev/null
s6-setuidgid $BITNAMI_APP_USER $BITNAMI_APP_DIR/bin/postgres --single $PROGRAM_OPTIONS >/dev/null
echo "==> Granting access to $POSTGRESQL_USER to the database $POSTGRESQL_DATABASE..."
echo ""
echo "GRANT ALL PRIVILEGES ON DATABASE $POSTGRESQL_DATABASE to $POSTGRESQL_USER;" | \
gosu $BITNAMI_APP_USER $BITNAMI_APP_DIR/bin/postgres --single $PROGRAM_OPTIONS >/dev/null
s6-setuidgid $BITNAMI_APP_USER $BITNAMI_APP_DIR/bin/postgres --single $PROGRAM_OPTIONS >/dev/null
fi
}