diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 2d579f7..1cb476b 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,10 +1,20 @@ // spell: disable { "name": "Kubernetes", - "dockerComposeFile": "docker-compose.yml", - "service": "app", - "workspaceFolder": "/app", + "build": { + "dockerfile": "Dockerfile", + "context": ".." + }, "remoteUser": "vscode", + "workspaceFolder": "/app", + "workspaceMount": "source=${localWorkspaceFolder},target=/app,type=bind,consistency=delegated", + "runArgs": ["-h","nyu", "--name", "lab-kubernetes"], + "remoteEnv": { + "FLASK_DEBUG:": "True", + "FLASK_APP": "wsgi:app", + "PORT": "8080", + "GUNICORN_BIND": "0.0.0.0:8080" + }, "customizations": { "vscode": { "settings": { diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml deleted file mode 100644 index 8ec2ef2..0000000 --- a/.devcontainer/docker-compose.yml +++ /dev/null @@ -1,38 +0,0 @@ -version: "3" - -services: - app: - build: - context: .. - dockerfile: .devcontainer/Dockerfile - hostname: nyu - container_name: lab-kubernetes - init: true - volumes: - - ..:/app - command: sleep infinity - environment: - FLASK_APP: wsgi:app - PORT: 8080 - DATABASE_URI: "redis://redis:6379/0" - networks: - - dev - depends_on: - - redis - - redis: - image: redis:6-alpine - hostname: redis - container_name: redis - ports: - - 6379 - volumes: - - redis:/data - networks: - - dev - -volumes: - redis: - -networks: - dev: null diff --git a/.vscode/launch.json b/.vscode/launch.json index 895570f..2df054b 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -6,7 +6,7 @@ "request": "launch", "module": "flask", "env": { - "FLASK_APP": "service:app", + "FLASK_APP": "wsgi:app", "FLASK_ENV": "development" }, "args": [ diff --git a/.vscode/tasks.json b/.vscode/tasks.json index b2d7f44..89fea38 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -6,7 +6,7 @@ { "label": "TDD tests", "type": "shell", - "command": "nosetests", + "command": "pytest", "group": { "kind": "test", "isDefault": true