refactor(server): use server from Docker image

cal-itp · Oct 6, 2021 · a1a18d2 · a1a18d2
1 parent a688230
commit a1a18d2
Show file tree

Hide file tree

Showing 9 changed files with 2 additions and 308 deletions.
diff --git a/.devcontainer.json b/.devcontainer.json
@@ -3,7 +3,7 @@
     "name": "cal-itp/benefits",
     "dockerComposeFile": ["./localhost/docker-compose.yml"],
     "service": "dev",
-    "runServices": ["dev", "docs", "server"],
+    "runServices": ["dev", "docs"],
     "workspaceFolder": "/home/calitp/app",
     "postStartCommand": ["/bin/bash", "bin/init.sh"],
     "postAttachCommand": ["/bin/bash", "localhost/bin/init.sh"],

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -14,21 +14,6 @@
                 "0.0.0.0:8000"
             ],
             "django": true
-        },
-        {
-            "name": "Flask: Eligibility Verification Server",
-            "type": "python",
-            "request": "attach",
-            "connect": {
-                "host": "localhost",
-                "port": 5789
-            },
-            "pathMappings": [
-                {
-                    "localRoot": "${workspaceFolder}/localhost/server",
-                    "remoteRoot": "/usr/src/server"
-                }
-            ]
         }
     ]
 }
diff --git a/localhost/data/server.json b/localhost/data/server.json
diff --git a/localhost/docker-compose.yml b/localhost/docker-compose.yml
@@ -54,16 +54,9 @@ services:
       - ../:/home/calitp/app:cached
 
   server:
-    build: ./server
-    image: eligibility_verification_server:dev
-    command: python -m debugpy --listen 0.0.0.0:5678 app.py
-    environment:
-      - FLASK_APP=app.py
-      - FLASK_DEBUG=1
-      - FLASK_ENV=development
+    image: ghcr.io/machikoyasuda/eligibility-server:test
     ports:
       - "5000"
-      - "5678"
     volumes:
       - ./server:/usr/src/server:cached
       - ./data:/usr/src/server/data

diff --git a/localhost/keys/server.key b/localhost/keys/server.key
diff --git a/localhost/server/Dockerfile b/localhost/server/Dockerfile
diff --git a/localhost/server/app.py b/localhost/server/app.py
diff --git a/localhost/server/requirements.txt b/localhost/server/requirements.txt
diff --git a/localhost/server/static/tokenize.js b/localhost/server/static/tokenize.js