Merge pull request #183 from normanjaeckel/SomeFixes

Fixed some settings.
OpenSlides · Oct 6, 2020 · 4dc025e · 4dc025e
2 parents 68f1d80 + af5ad6e
commit 4dc025e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/cli/generate_models.py b/cli/generate_models.py
@@ -28,7 +28,7 @@
     "boolean": "BooleanField",
     "JSON": "JSONField",
     "HTMLStrict": "HTMLStrictField",
-    "HtmlPermissive": "HTMLPermissiveField",
+    "HTMLPermissive": "HTMLPermissiveField",
     "float": "FloatField",
     "decimal(6)": "DecimalField",
     "timestamp": "TimestampField",

diff --git a/dev/Dockerfile-dev b/dev/Dockerfile-dev
@@ -2,7 +2,7 @@ FROM python:3.8.5-slim-buster
 
 RUN apt-get update && apt-get install --yes make git curl ncat
 
-WORKDIR /srv/code
+WORKDIR /app
 RUN mkdir dev
 
 COPY requirements.txt .

diff --git a/dev/cleanup-standalone.sh b/dev/cleanup-standalone.sh
@@ -7,5 +7,6 @@ SCRIPTPATH="$( cd "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
 BASEPATH=$SCRIPTPATH/../
 
 docker run --interactive --tty \
-    --volume=$BASEPATH/openslides_backend:/srv/code/openslides_backend \
-    --volume=$BASEPATH/tests:/srv/code/tests --rm openslides-backend-dev make
+    --volume=$BASEPATH/openslides_backend:/app/openslides_backend \
+    --volume=$BASEPATH/tests:/app/tests \
+    --volume=$BASEPATH/cli:/app/cli --rm openslides-backend-dev make
diff --git a/dev/docker-compose.dev.yml b/dev/docker-compose.dev.yml
@@ -11,9 +11,9 @@ services:
             - "9003:9003"
         command: sleep infinity
         volumes:
-            - ../openslides_backend:/srv/code/openslides_backend
-            - ../tests:/srv/code/tests
-            - ../cli:/srv/code/cli
+            - ../openslides_backend:/app/openslides_backend
+            - ../tests:/app/tests
+            - ../cli:/app/cli
         environment:
             - DATASTORE_READER_HOST=reader
             - DATASTORE_WRITER_HOST=writer