Use Eligibility Server from GitHub registry (#128)

The local dev container is now using a server from the eligibility-server Docker image from the GitHub Container Registry, not from localhost/server. * Use the main tag of the eligibility server image from GitHub Container Registry * Remove Flask debugger * Remove localhost/server files
cal-itp · Oct 7, 2021 · 2a802b5 · 2a802b5
2 parents a688230 + 08204a9
commit 2a802b5
Show file tree

Hide file tree

Showing 10 changed files with 2 additions and 313 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,7 +2,7 @@
 *.env
 *.mo
 **/data/*.json
-!localhost/data/[client|server].json
+!localhost/data/client.json
 static/
 !benefits/static
 __pycache__/
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -35,5 +35,4 @@ repos:
     hooks:
       - id: bandit
         args: ["-ll"]
-        exclude: ^server/
         files: .py$
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,20 +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/cal-itp/eligibility-server:main
     ports:
       - "5000"
-      - "5678"
-    volumes:
-      - ./server:/usr/src/server:cached
-      - ./data:/usr/src/server/data
-      - ./keys:/usr/src/server/keys
 
   s3pull:
     image: amazon/aws-cli

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