Docker Compose reorganized

.docker/database/Dockerfile

@@ -0,0 +1 @@
+FROM mariadb:latest

.docker/web/Dockerfile

@@ -0,0 +1,13 @@
+FROM python:3.8
+
+ENV PYTHONUNBUFFERED 1
+
+RUN mkdir /code
+WORKDIR /code
+
+RUN pip install --upgrade pip
+
+ADD requirements.txt .
+RUN apt update \
+    && apt install -y memcached libmemcached-dev \
+    && pip install -r requirements.txt

.docker/web/requirements.txt

@@ -0,0 +1,15 @@
+Django>=2.0.0,<2.1
+mysqlclient>=1.3.7,<1.4
+gunicorn
+sqlparse
+argon2-cffi
+bcrypt
+pytz
+pyyaml
+sentry-sdk>=0.14.1
+selenium
+whitenoise
+django-storages<1.10
+boto3
+django-bmemcached
+python-binary-memcached

.gitignore

@@ -3,6 +3,7 @@
 __pycache__
 /.cache
 /.db
+.db-data
 
 /docs/_build/
 
@@ -16,8 +17,8 @@ __pycache__
 .DS_store
 
 # Local building tools
-/docker-compose.yml
+docker-compose.yml
 
 ## Local IDEs dirs
-.idea
+/.idea
 /.vscode

docker-compose.example.yml

@@ -1,26 +1,33 @@
-version: '3'
+version: '3.9'
+
+services:
 
-services:  
-  db:
-    image: mysql:5.5
-    volumes:
-      - .db:/var/lib/mysql
-    environment:
-      - MYSQL_ROOT_PASSWORD=docker
-      - MYSQL_DATABASE=dracidoupe_cz
   web:
-    build: .
-    command: python3 manage.py runserver 0.0.0.0:8000
+    build:
+      context: .docker/web
+      dockerfile: Dockerfile
+    depends_on:
+      - db
     volumes:
       - .:/code
     ports:
       - "8000:8000"
-        - "32768-65535"
-    depends_on:
-      - db
+    command: /bin/bash -c "python3 manage.py runserver 0.0.0.0:8000"
+
+  db:
+    build:
+      context: .docker/database
+      dockerfile: Dockerfile
+    volumes:
+      - .docker/database/.db-data:/var/lib/mysql
+    environment:
+      - MARIADB_ROOT_PASSWORD=docker
+      - MARIADB_DATABASE=dracidoupe_cz
+
   adminer:
     image: adminer
-    links:
-      - db
     ports:
-      - 81:80
+      - "8080:8080"
+    depends_on:
+      - db
+

docker-compose.server_ci.yml

@@ -5,6 +5,7 @@ version: '3'
 # See https://circleci.com/docs/2.0/executor-types/
 
 services:
+
   db:
     image: mysql:5.5
     environment:
@@ -13,8 +14,12 @@ services:
   web:
     environment:
       - SERVER_CI=true
-    build: .
+    build:
+      context: .docker/web
+      dockerfile: Dockerfile
     command: python3 manage.py runserver 0.0.0.0:8000
+    volumes:
+      - .:/code
     expose:
       - "8000"
       - "32768-65535"