Skip to content

Commit 1a804cd

Browse files
committed
Requested changes
1 parent faf9714 commit 1a804cd

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

dev/local/Makefile

+9-4
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,11 @@ web:
101101
--network delphi-net --name delphi_web_epidata \
102102
delphi_web_epidata >$(LOG_WEB) 2>&1 &
103103

104-
.PHONY=web_debug
105-
web_debug:
104+
.PHONY=web_vscodedebug
105+
web_vscodedebug:
106+
@# Full giude can be found by the link below:
107+
@# https://docs.google.com/presentation/d/1RMxsPO3uYqjAqBNzhDJTtLM0Xglm7kAijFi2W2tzd6U/edit?usp=sharing
108+
106109
@# Stop container if running
107110
@if [ $(WEB_CONTAINER_ID) ]; then\
108111
docker stop $(WEB_CONTAINER_ID);\
@@ -121,9 +124,11 @@ web_debug:
121124
@# Run the web server
122125
@# MODULE_NAME specifies the location of the `app` variable, the actual WSGI application object to run.
123126
@# see https://github.com/tiangolo/meinheld-gunicorn-docker#module_name
127+
128+
@# mount the debuging start script (start_vscodedebug.sh) into the container so the webserver uses it
124129
@docker run --rm -p 127.0.0.1:5000:5000 -p 127.0.0.1:5678:5678 \
125130
$(M1) \
126-
--mount type=bind,source=$(CWD)repos/delphi/delphi-epidata/devops/start.sh,target=/start.sh,readonly \
131+
--mount type=bind,source=$(CWD)repos/delphi/delphi-epidata/devops/start_vscodedebug.sh,target=/start_vscodedebug.sh,readonly \
127132
--mount type=bind,source=$(CWD)repos/delphi/delphi-epidata/src/server,target=/app/delphi/epidata/server \
128133
--env "MODULE_NAME=delphi.epidata.server.main" \
129134
--env "SQLALCHEMY_DATABASE_URI=$(sqlalchemy_uri)" \
@@ -171,7 +176,7 @@ py:
171176
all: db web py
172177

173178
.PHONY=debug
174-
debug: db web_debug py
179+
debug: db web_vscodedebug py
175180

176181
.PHONY=test
177182
test:
File renamed without changes.

0 commit comments

Comments
 (0)