Merge pull request #79 from cybertec-postgresql/nss_wrapper

Nss wrapper

Author: Schmaetz

Makefile

@@ -87,7 +87,6 @@ postgres-build:
 			--build-arg OLD_PG_VERSIONS="$(OLD_PG_VERSIONS)"					\
 			--build-arg PGVERSION=$(PGVERSION)									\
 			--build-arg ETCD_VERSION=$(ETCD_VERSION)							\
-			--build-arg PGVERSION=$(PGVERSION) 									\
 			--build-arg ARCH=$(ARCH) 											
 
 postgres: postgres-build

docker/postgres-gis/Dockerfile

@@ -202,6 +202,10 @@ COPY launcher/postgres/launch.sh /
 
 ENTRYPOINT ["/scripts/nss_wrapper/nss_wrapper.sh"]
 
+ENV LD_PRELOAD=/usr/lib64/libnss_wrapper.so \
+    NSS_WRAPPER_PASSWD=/tmp/nss_wrapper/passwd \
+    NSS_WRAPPER_GROUP=/tmp/nss_wrapper/group 
+
 USER postgres
 
 CMD ["/bin/sh", "/launch.sh", "init"]

docker/postgres/Dockerfile

@@ -138,7 +138,7 @@ ENV LC_ALL=en_US.utf-8 \
     PGHOME=/home/postgres \
     RW_DIR=/run \
     TIMESCALEDB=$TIMESCALEDB \
-    DEMO=$DEMO
+    DEMO=$DEMO 
 
 ENV LOG_ENV_DIR=$RW_DIR/etc/log.d/env \
     PGROOT=$PGHOME/pgdata/pgroot
@@ -199,6 +199,10 @@ COPY launcher/postgres/launch.sh /
 
 ENTRYPOINT ["/scripts/nss_wrapper/nss_wrapper.sh"]
 
+ENV LD_PRELOAD=/usr/lib64/libnss_wrapper.so \
+    NSS_WRAPPER_PASSWD=/tmp/nss_wrapper/passwd \
+    NSS_WRAPPER_GROUP=/tmp/nss_wrapper/group 
+
 USER postgres
 
 CMD ["/bin/sh", "/launch.sh", "init"]

scripts/nss_wrapper/nss_wrapper.sh

@@ -38,8 +38,4 @@ if [[ ! $(cat "${NSS_GROUP}") =~ ${NSS_USERNAME}:x:${CURRENT_USER} ]]; then
     echo "Group was added via nss_wrapper"
 fi
 
-export LD_PRELOAD=/usr/lib64/libnss_wrapper.so
-export NSS_WRAPPER_PASSWD="${NSS_PASSWD}"
-export NSS_WRAPPER_GROUP="${NSS_GROUP}"
-
 exec "$@"