Support using Docker for development

README.md

@@ -45,11 +45,31 @@ Compile the translation files:
 python manage.py compilemessages
 ```
 
+#### Docker
+
+You can also use Docker in development. Start server in `http://localhost:8000` by running:
+
+```shell
+docker-compose up
+```
+
+To run Django commands:
+
+```shell
+docker-compose run app python manage.py <command>
+```
+
 ### Production
 
 The project is containerized using Docker Compose. You will still need to set some
 variables in your environment; see the first few lines in `aplans/settings.py`.
 
+Use this command to apply the production configuration `docker-compose.production.yml`:
+
+```shell
+docker-compose -f docker-compose.yml -f docker-compose.production.yml up
+```
+
 ## Contributing
 
 ### Python requirements

docker-compose.override.yml

@@ -0,0 +1,12 @@
+# Development configuration file
+#
+# This file is automatically merged with docker-compose.yml
+# when 'docker-compose up' is run.
+
+version: '3.2'
+services:
+  app:
+    volumes:
+      - .:/code
+    environment:
+      - DATABASE_URL=postgres://aplans@db/aplans

docker-compose.production.yml

@@ -0,0 +1,15 @@
+# Production configuration file
+#
+# To apply this configuration, run:
+# docker-compose -f docker-compose.yml -f docker-compose.production.yml up
+
+version: '3.2'
+services:
+  db:
+    restart: always
+
+  app:
+    build:
+      cache_from:
+        - ${DOCKER_CACHE_IMAGE:-aplans_app}
+    restart: always

docker-compose.yml

@@ -5,7 +5,6 @@ services:
     build:
       context: .
       dockerfile: ./docker/db/Dockerfile
-    restart: always
     environment:
       - POSTGRES_USER=aplans
     volumes:
@@ -16,9 +15,6 @@ services:
     build:
       context: .
       dockerfile: docker/app/Dockerfile
-      cache_from:
-        - ${DOCKER_CACHE_IMAGE:-aplans_app}
-    restart: always
     volumes:
       - aplans_media:/srv/media
     environment:

docker/app/Dockerfile

@@ -36,4 +36,4 @@ RUN ./manage.py compilemessages
 COPY ./docker/app/docker-entrypoint.sh /
 COPY ./docker/app/wait-for-it.sh /
 
-ENTRYPOINT ["/bin/bash", "/docker-entrypoint.sh"]
+CMD ["/bin/bash", "/docker-entrypoint.sh"]