Move Docker files into .devcontainer

Dockerfile.dev → .devcontainer/Dockerfile

@@ -2,14 +2,18 @@ FROM eligibility_server:latest
 
 USER root
 
-# install tooling: curl, git, jq, ssh
-# install python tooling: pip, flake8, pre-commit
+# install container tooling
 RUN apt-get update \
     && apt-get install -qq --no-install-recommends curl git jq ssh build-essential \
     && python -m pip install --upgrade pip
 
-RUN pip install --no-cache-dir flake8 pre-commit coverage pytest
+# install python tooling
+RUN pip install --no-cache-dir flake8 pre-commit
 
-# install docs tooling:
+# install docs tooling
 COPY docs/requirements.txt docs/requirements.txt
 RUN pip install --no-cache-dir -r docs/requirements.txt
+
+# install test tooling
+COPY tests/requirements.txt tests/requirements.txt
+RUN pip install -r tests/requirements.txt

docker-compose.yml → .devcontainer/compose.yml

@@ -2,30 +2,30 @@ version: "3.8"
 
 services:
   server:
-    build: .
+    build: ..
     env_file: .env
     image: eligibility_server:latest
     ports:
       - "5000"
     volumes:
-      - ./:/home/calitp/app/
+      - ../:/home/calitp/app/
   dev:
     build:
-      context: .
-      dockerfile: Dockerfile.dev
+      context: ..
+      dockerfile: .devcontainer/Dockerfile
     command: sleep infinity
     entrypoint: []
     env_file: .env
     image: eligibility_server:dev
     ports:
       - "5000"
     volumes:
-      - ./:/home/calitp/app/
+      - ../:/home/calitp/app/
   docs:
     image: eligibility_server:dev
     entrypoint: mkdocs
     command: serve --dev-addr "0.0.0.0:8000"
     ports:
       - "8000"
     volumes:
-      - ./:/home/calitp/app:cached
+      - ../:/home/calitp/app:cached

.devcontainer.json → .devcontainer/devcontainer.json

@@ -1,11 +1,11 @@
 // For format details, see https://aka.ms/vscode-remote/devcontainer.json
 {
   "name": "cal-itp/eligibility-server",
-  "dockerComposeFile": ["./docker-compose.yml"],
+  "dockerComposeFile": ["compose.yml"],
   "service": "dev",
   "runServices": ["dev", "docs"],
   "workspaceFolder": "/home/calitp/app",
-  "postAttachCommand": ["/bin/bash", "bin/pre-commit.sh"],
+  "postAttachCommand": ["/bin/bash", ".devcontainer/pre-commit.sh"],
 
   // Set *default* container specific settings.json values on container create.
   "settings": {
@@ -21,6 +21,6 @@
   "extensions": [
       "batisteo.vscode-django",
       "ms-python.python",
-      "ms-python.vscode-pylance",
+      "ms-python.vscode-pylance"
   ]
 }

docs/README.md

@@ -23,6 +23,7 @@ Running the application locally is possible with [Docker and Docker Compose](htt
 ### Build the Docker container for local development
 
 ```bash
+cd .devcontainer
 docker compose build server
 ```
 

docs/getting-started.md

@@ -18,6 +18,7 @@ cd eligibility-server
 Use the sample as the template.
 
 ```bash
+cd .devcontainer
 cp .env.sample .env
 ```
 
@@ -29,6 +30,7 @@ The .env file specifies two values:
 ### Build image using Docker Compose
 
 ```bash
+cd .devcontainer
 docker compose build --no-cache server
 ```