chore: Small improvements in the docker-compose setup

- remove the network used by all containers (dc creates it by default)
- set default DATABASE_TYPE to sqlite => simpler dc up commands
- change restart policy to unless-stopped => containers don't restart
  after system restart (which was annoying in local development)

Author: natkam

docs/source/installation/docker.md

@@ -17,7 +17,7 @@ the containers together with their services.
 
 Run the following command:
 ```bash
-DATABASE_TYPE=sqlite docker compose up --build -d
+docker compose up --build -d
 ```
 
 This command builds the images and starts the containers in detached mode. It sets SQLite as its database that is integrated in `Grader Service`.
@@ -36,12 +36,10 @@ defined in a separate `docker-compose-postgres.yml` file.
 
 Run the following command:
 ```bash
-DATABASE_TYPE=postgres docker compose -f docker-compose.yml -f docker-compose-postgres.yml up -d
+docker compose -f docker-compose.yml -f docker-compose-postgres.yml up -d
 ```
 
 To stop and remove the containers, run:
 ```bash
 docker compose -f docker-compose.yml -f docker-compose-postgres.yml down -v
 ```
-
-

examples/docker_compose/README.md

@@ -16,7 +16,7 @@ the containers together with their services.
 
 Run the following command:
 ```bash
-DATABASE_TYPE=sqlite docker compose up --build -d
+docker compose up --build -d
 ```
 
 This command builds the images and starts the containers in detached mode. It sets SQLite as its database that is integrated in `Grader Service`.
@@ -35,12 +35,10 @@ defined in a separate `docker-compose-postgres.yml` file.
 
 Run the following command:
 ```bash
-DATABASE_TYPE=postgres docker compose -f docker-compose.yml -f docker-compose-postgres.yml up -d
+docker compose -f docker-compose.yml -f docker-compose-postgres.yml up -d
 ```
 
 To stop and remove the containers, run:
 ```bash
 docker compose -f docker-compose.yml -f docker-compose-postgres.yml down -v
 ```
-
-

examples/docker_compose/docker-compose-postgres.yml

@@ -10,22 +10,18 @@ services:
       - ./grader_service_config.py:/app/grader_service_config.py
       - ./data_only.sql:/app/data_only.sql
       - ./init-db.sh:/app/init-db.sh
-    networks:
-      - network
     depends_on:
       postgres:
         condition: service_healthy
 
   postgres:
     image: postgres
-    restart: always
+    restart: unless-stopped
     environment:
       # required for using postgres image
       POSTGRES_PASSWORD: postgres
       POSTGRES_DB: grader
-    networks:
-      - network
     healthcheck:
       test: [ "CMD", "pg_isready", "-U", "postgres" ]
       interval: 5s
-      retries: 5
+      retries: 5

examples/docker_compose/docker-compose.yml

@@ -9,15 +9,13 @@ services:
       - ./grader_service_config.py:/app/grader_service_config.py
       - service_dir:/app/service_dir
     environment:
-      DATABASE_TYPE: ${DATABASE_TYPE}
+      DATABASE_TYPE: ${DATABASE_TYPE:-sqlite}
       RABBITMQ_GRADER_SERVICE_USERNAME: grader_user
       RABBITMQ_GRADER_SERVICE_PASSWORD: grader_password
-    restart: always
+    restart: unless-stopped
     depends_on:
       init-volume:
         condition: service_completed_successfully
-    networks:
-      - network
     expose:
       - "4010"
 
@@ -29,18 +27,14 @@ services:
       - /var/run/docker.sock:/var/run/docker.sock:rw
       - ./jupyterhub_config.py:/app/jupyterhub_config.py
       - ./data-hub:/data
-    restart: always
+    restart: unless-stopped
     depends_on:
       - service
-    networks:
-      - network
     ports:
       - "8080:8080"
 
   rabbitmq:
     image: rabbitmq:latest
-    networks:
-      - network
     environment:
       RABBITMQ_DEFAULT_VHOST: grader
       RABBITMQ_DEFAULT_USER: grader_user
@@ -54,12 +48,6 @@ services:
     build:
       context: ../..
       dockerfile: examples/docker_compose/Dockerfile-Service
-    networks:
-      - network
-    command:
-      - "grader-worker"
-      - "-f"
-      - "/app/grader_service_config.py"
     volumes:
       - ./grader_service_config.py:/app/grader_service_config.py
       - service_dir:/app/service_dir
@@ -68,7 +56,7 @@ services:
     environment:
       RABBITMQ_GRADER_SERVICE_USERNAME: grader_user
       RABBITMQ_GRADER_SERVICE_PASSWORD: grader_password
-      DATABASE_TYPE: ${DATABASE_TYPE}
+      DATABASE_TYPE: ${DATABASE_TYPE:-sqlite}
 
   init-volume:
     build:
@@ -77,14 +65,7 @@ services:
     volumes:
       - ./service_dir:/local_service_dir
       - service_dir:/volume_service_dir
-    networks:
-      - network
-
 
 volumes:
   jupyterhub-data:
   service_dir:
-
-networks:
-  network:
-    driver: bridge