fix Makefile target for rmdata image, fix pgo-backrest-repo dockerfile to match rhel version

jmccormick2001 · jmccormick2001 · commit 63efaaf25d95 · 2019-01-22T10:42:34.000-05:00
diff --git a/Makefile b/Makefile
@@ -130,7 +130,7 @@ all:
 	make pgo
 	make lsimage
 	make loadimage
-	make rmdataimage
+	make pgo-rmdata-image
 	make sqlrunnerimage
 	make pgo-backrest-image
 	make pgo-backrest-restore-image
diff --git a/centos7/Dockerfile.pgo-backrest-repo.centos7 b/centos7/Dockerfile.pgo-backrest-repo.centos7
@@ -25,8 +25,15 @@ RUN chmod +x /usr/local/bin/pgo-backrest-repo.sh && mkdir -p /opt/cpm/bin && cho
 
 ADD bin/uid_pgbackrest.sh /opt/cpm/bin
 
-VOLUME ["/sshd", "/backrestrepo" ]
+RUN chmod g=u /etc/passwd && \
+        chmod g=u /etc/group
+
+RUN mkdir /.ssh && chown pgbackrest:pgbackrest /.ssh && chmod o+rwx /.ssh
 
 USER pgbackrest
 
+ENTRYPOINT ["/opt/cpm/bin/uid_pgbackrest.sh"]
+
+VOLUME ["/sshd", "/backrestrepo" ]
+
 CMD ["pgo-backrest-repo.sh"]
