initial load cmd working

Author: Jeff McCormick

bin/csvload/start.sh

@@ -17,14 +17,23 @@
 # start the csv load job
 #
 # /pgdata is a volume that gets mapped into this container
-# $TABLE_TO_LOAD postgres table to copy data into
-# $CSV_FILE_PATH path to csv file
+# $CSV_PATH host we are connecting to
 # $DB_HOST host we are connecting to
 # $DB_USER pg user we are connecting with
 # $DB_PASS pg user password we are connecting with
 # $DB_PORT pg port we are connecting to
 #
 
+function create_pgpass() {
+cd /tmp
+cat >> ".pgpass" <<-EOF
+*:*:*:*:${DB_PASS}
+EOF
+chmod 0600 .pgpass
+export PGPASSFILE=/tmp/.pgpass
+#chown $UID:$UID $PGPASSFILE
+cat $PGPASSFILE
+}
 function ose_hack() {
         export USER_ID=$(id -u)
         export GROUP_ID=$(id -g)
@@ -39,23 +48,10 @@ ose_hack
 
 echo $CSVFILE_PATH
 
-export PGPASSFILE=/tmp/pgpass
-
-echo "*:*:*:"$DB_USER":"$DB_PASS  >> $PGPASSFILE
-
-chmod 600 $PGPASSFILE
+create_pgpass
 
-chown $UID:$UID $PGPASSFILE
 
-# cat $PGPASSFILE
 
-#pg_basebackup --label=$BACKUP_LABEL --xlog --pgdata $CSVFILE_PATH --host=$DB_HOST --port=$DB_PORT -U $DB_USER
-
-#chown -R $UID:$UID $CSVFILE_PATH
-# 
-# open up permissions for the OSE Dedicated random UID scenario
-#
-#chmod -R o+rx $CSVFILE_PATH
 echo "COPY $TABLE_TO_LOAD  FROM '/pgdata/$CSV_FILE_PATH' WITH (FORMAT csv);" > /tmp/copycommand
 psql -U $DB_USER -h $DB_HOST $DB_DATABASE -f /tmp/copycommand
 echo "csvload has ended!"

centos7/Dockerfile.csvload.centos7

@@ -20,8 +20,8 @@ ENV PGVERSION="9.6" PGDG_REPO="pgdg-centos96-9.6-3.noarch.rpm"
 # PGDG Postgres repo
 RUN rpm -Uvh https://download.postgresql.org/pub/repos/yum/${PGVERSION}/redhat/rhel-7-x86_64/${PGDG_REPO}
 
-RUN yum -y update &&  \
- yum install -y \
+RUN yum -y update &&  yum -y install epel-release \
+ && yum install -y \
 	gettext \
 	hostname \
  	nss_wrapper \
@@ -30,11 +30,12 @@ RUN yum -y update &&  \
  && yum -y install postgresql96 \
  && yum clean all -y
 
-RUN mkdir -p /opt/cpm/bin /opt/cpm/conf
+RUN mkdir -p /opt/cpm/bin /opt/cpm/conf 
 ADD bin/csvload/ /opt/cpm/bin
-#RUN chown -R 26:26 /opt/cpm /pgdata
+ADD conf/csvload/ /opt/cpm/conf
+RUN chown -R 26:26 /opt/cpm 
 
-VOLUME ["/pgdata"]
+VOLUME /pgdata
 
 USER 26
 

client/cmd/load.go

@@ -149,8 +149,8 @@ func getLoadConfigFile() {
 	if err == nil {
 		log.Debugf("Using load config file: %s\n", viper.ConfigFileUsed())
 	} else {
-		log.Debug("load config file not found")
-		return
+		log.Error("load config file not found")
+		os.Exit(2)
 	}
 
 	//LoadConfigTemplate.Name = viper.GetString("Name")

conf/csvload/passwd.template

@@ -0,0 +1,14 @@
+root:x:0:0:root:/root:/bin/bash
+bin:x:1:1:bin:/bin:/sbin/nologin
+daemon:x:2:2:daemon:/sbin:/sbin/nologin
+adm:x:3:4:adm:/var/adm:/sbin/nologin
+lp:x:4:7:lp:/var/spool/lpd:/sbin/nologin
+sync:x:5:0:sync:/sbin:/bin/sync
+shutdown:x:6:0:shutdown:/sbin:/sbin/shutdown
+halt:x:7:0:halt:/sbin:/sbin/halt
+mail:x:8:12:mail:/var/spool/mail:/sbin/nologin
+operator:x:11:0:operator:/root:/sbin/nologin
+games:x:12:100:games:/usr/games:/sbin/nologin
+ftp:x:14:50:FTP User:/var/ftp:/sbin/nologin
+nobody:x:99:99:Nobody:/:/sbin/nologin
+postgres:x:${USER_ID}:${GROUP_ID}:PostgreSQL Server:${HOME}:/bin/bash

examples/policy/xrayapp.sql

@@ -1,5 +1,5 @@
 \c userdb;
-create table xrayapp (id int, key string, value string);
+create table xrayapp (id int, key varchar(40), value varchar(40));
 create table a (id int);
-create table xraycsvtable (name string, state string, zip string);
+create table xraycsvtable (name varchar(40), state varchar(40), zip varchar(40));
 

examples/sample-load-config.yaml

@@ -1,6 +1,6 @@
 CO_IMAGE_TAG:  centos7-1.5.1
 DB_DATABASE:  userdb
-DB_USER:  testuser
+DB_USER:  postgres
 DB_PASS:  password
 DB_PORT:  5432
 TABLE_TO_LOAD:  xraycsvtable