Fix some errors

app/Dockerfile

@@ -10,9 +10,9 @@ WORKDIR /usr/src/app
 
 # install dependencies
 RUN pip install --upgrade pip
-RUN pip install pipenv
-COPY ./Pipfile /usr/src/app/Pipfile
-RUN pipenv install --skip-lock --system --dev
+
+COPY ./requirements.txt /usr/src/app/requirements.txt
+RUN pip install -r requirements.txt
 
 # copy project
 COPY . /usr/src/app/
@@ -22,5 +22,5 @@ RUN git clone https://github.com/vishnubob/wait-for-it.git /wait-for-it
 RUN chmod a+x /wait-for-it/wait-for-it.sh
 
 # add entry point
-COPY ./django-entrypoint.sh /django-entrypoint.sh
-ENTRYPOINT ["docker-entrypoint.sh"]
+COPY ./django-entrypoint.sh django-entrypoint.sh
+ENTRYPOINT ["./django-entrypoint.sh"]

app/Pipfile

@@ -1,22 +0,0 @@
-[[source]]
-
-url = "https://pypi.python.org/simple"
-verify_ssl = true
-name = "pypi"
-
-
-[packages]
-
-django= "==2.1.4"
-psycopg2= "==2.8.3"
-gunicorn= "==19.9.0"
-lxml= "==4.2.5"
-tqdm= "==4.28.1"
-django-watson= "==1.5.2"
-django-tables2= "==2.0.3"
-django-jchart= "==0.4.2"
-
-
-[requires]
-
-python_version = "3.7"

app/Pipfile.lock

@@ -1,42 +0,0 @@
-{
-    "_meta": {
-        "hash": {
-            "sha256": "653830713010356a8c80045a262ac3ea3bce011557c04f8cb5f7305a86068d02"
-        },
-        "pipfile-spec": 6,
-        "requires": {
-            "python_version": "3.7"
-        },
-        "sources": [
-            {
-                "name": "pypi",
-                "url": "https://pypi.python.org/simple",
-                "verify_ssl": true
-            }
-        ]
-    },
-    "default": {
-        "django": {
-            "hashes": [
-                "sha256:7f246078d5a546f63c28fc03ce71f4d7a23677ce42109219c24c9ffb28416137",
-                "sha256:ea50d85709708621d956187c6b61d9f9ce155007b496dd914fdb35db8d790aec"
-            ],
-            "version": "==2.1"
-        },
-        "gunicorn": {
-            "hashes": [
-                "sha256:aa8e0b40b4157b36a5df5e599f45c9c76d6af43845ba3b3b0efe2c70473c2471",
-                "sha256:fa2662097c66f920f53f70621c6c58ca4a3c4d3434205e608e121b5b3b71f4f3"
-            ],
-            "version": "==19.9.0"
-        },
-        "pytz": {
-            "hashes": [
-                "sha256:31cb35c89bd7d333cd32c5f278fca91b523b0834369e757f4c5641ea252236ca",
-                "sha256:8e0f8568c118d3077b46be7d654cc8167fa916092e28320cde048e54bfc9f1e6"
-            ],
-            "version": "==2018.7"
-        }
-    },
-    "develop": {}
-}

app/blog/templates/blog/impressum.html

@@ -13,7 +13,7 @@
                     <b>Angaben gemäß § 5 TMG</b>
                     <br />
                     <p>Stephan Porada<br />
-                        Bremer Straße 43<br />
+                        Bremer Straße 17a<br />
                         33613 Bielefeld</p>
                     <br />
                     <b>Kontakt</b>
@@ -23,7 +23,7 @@
                     <b>Verantwortlich für den Inhalt nach § 55 Abs. 2 RStV</b>
                     <br />
                     <p>Stephan Porada<br />
-                        Bremer Straße 43<br />
+                        Bremer Straße 17a<br />
                         33613 Bielefeld</p>
                     <br />
                     <b>Haftung für Inhalte</b>

app/django-entrypoint.sh

@@ -3,3 +3,4 @@
 python manage.py collectstatic --noinput
 python manage.py makemigrations --noinput
 python manage.py migrate --noinput
+python manage.py runserver 0.0.0.0:8000

app/requirements.txt

@@ -0,0 +1,8 @@
+Django==2.1.4
+psycopg2==2.8.3
+gunicorn==19.9.0
+lxml==4.2.5
+tqdm==4.28.1
+django-watson==1.5.2
+django-tables2==2.0.3
+django-jchart==0.4.2

docker-compose.yml

@@ -11,13 +11,9 @@ services:
       - 8000
     depends_on:
       - db
-    command: bash -c "/wait-for-it/wait-for-it.sh db:5432 --strict --timeout=0 -- bash django-entrypoint.sh && gunicorn bundesdata_app.wsgi:application --bind 0.0.0.0:8000"
+    command: bash -c /wait-for-it/wait-for-it.sh db:5432 --strict --timeout=0
   db:
     image: postgres:11.2
-    environment:
-            - POSTGRES_USER=bundesdata_app_user
-            - POSTGRES_PASSWORD=v3ry53cr3t
-            - POSTGRES_DB=bundesdata_db
     volumes:
       - ./postgres_data:/var/lib/postgresql/data/
   nginx: