diff --git a/Dockerfile b/Dockerfile index 6510ce4..a71931a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,25 +1,17 @@ FROM archlinux:latest RUN pacman -Syy RUN pacman -Syu --noconfirm -RUN pacman -S --noconfirm python python-pip git openssh postgresql sudo base-devel +RUN pacman -S --noconfirm python python-pip git postgresql sudo gcc RUN sudo -u postgres initdb --locale=en_US.UTF-8 -E UTF8 -D /var/lib/postgres/data 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.postgres /srv/logs/pgsql.log +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.postgres /srv/logs/pgsql.log +VOLUME ['/srv/Books ./Books','/srv/http .','/srv/logs ./logs','/var/lib/postgres/data ./data'] +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 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 && git fetch && 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 -# RUN gunicorn pyShelf.wsgi 8000:8000 -EXPOSE 80 22 8000 +RUN pip install -r requirements.txt +EXPOSE 80 8000 CMD ["sh", "-c","/srv/http/entry.sh"] diff --git a/entry.sh b/entry.sh index 63d2b6c..25497f9 100755 --- a/entry.sh +++ b/entry.sh @@ -1,4 +1,4 @@ #!/bin/bash -git pull -sh /srv/http/database.sh -/bin/bash +#sh /srv/http/database.sh +sudo -u postgres pg_ctl -D /var/lib/postgres/data -l /srv/logs/pgsql.log start && +#gunicorn pyShelf.wsgi 8000:8000