From 643f338faa4fe9df6e96c4a31756f5f54ac042f8 Mon Sep 17 00:00:00 2001
From: Raelon Masters <admin@mylocaltech.co>
Date: Tue, 7 Apr 2020 14:07:16 -0400
Subject: [PATCH] Added default entry point

---
 Dockerfile | 16 ++++++++--------
 entry.sh   |  6 ++++++
 2 files changed, 14 insertions(+), 8 deletions(-)
 create mode 100755 entry.sh

diff --git a/Dockerfile b/Dockerfile
index dc5037d..3c047a5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,23 +3,23 @@ RUN pacman -Syy
 RUN pacman -Syu --noconfirm
 RUN pacman -S --noconfirm python python-pip git openssh postgresql sudo base-devel
 RUN sudo -u postgres initdb --locale=en_US.UTF-8 -E UTF8 -D /var/lib/postgres/data
-RUN systemctl enable postgresql
 RUN useradd pyshelf && chpasswd pyshelf:pyshelf
 RUN mkdir -p /srv/Books && \
     mkdir -p /srv/http && \
     mkdir -p /srv/logs/ && \
+    mkdir -p /run/postgresql && \
     touch /srv/logs/pgsql.log && \
+    chown postgres.postgres /run/postgresql && \
     chown http.pyshelf /srv/Books && \
     chown http.pyshelf /srv/http && \
-    chown postgres /srv/logs/pgsql.log
-RUN systemctl enable sshd
-# RUN sudo -u postgres pg_ctl -D /var/lib/postgres/data -l /srv/logs/pgsql.log start
-VOLUME ['/srv/Books','/srv/http']
-# ENV nginx_conf /etc/nginx/nginx.conf
-ENV PYTHONUNBUFFERED 1
+    chown postgres.postgres /srv/logs/pgsql.log
+ENV PYTHONUNBUFFERED=1
+VOLUME ['/srv/Books','/srv/http','/srv/logs']
 WORKDIR /srv/http
 RUN git clone https://github.com/th3r00t/pyShelf.git /srv/http && \
     git checkout 0.5.0--docker && pip install -r requirements.txt
+# RUN sudo -u postgres pg_ctl -D /var/lib/postgres/data -l /srv/logs/pgsql.log start
 # RUN sudo -u postgres psql -f create_db.sql
-EXPOSE 80 22 8000
 # RUN gunicorn pyShelf.wsgi 8000:8000
+EXPOSE 80 22 8000
+CMD ["sh", "-c","entry.sh"]
diff --git a/entry.sh b/entry.sh
new file mode 100755
index 0000000..a9e688e
--- /dev/null
+++ b/entry.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+sudo -u postgres pg_ctl -D /var/lib/postgres/data -l /srv/logs/pgsql.log start
+sudo -u postgres psql -f create_db.sql
+rm entry.sh
+echo "sudo -u postgres pg_ctl -D /var/lib/postgres/data -l /srv/logs/lgsql.log start" > entry.sh
+chmod +x entry.sh