fix: eb dir -> ecs dir (#524)

* Revert "refactor: remove eb files (#518)" This reverts commit cbe3e1e. * fix: eb -> ecs * more stuff
chanzuckerberg · Oct 28, 2022 · 847141d · 847141d
1 parent 64fad93
commit 847141d
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 16 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -1,4 +1,4 @@
 bin
 dist
 docs
-/client/node_modules
+/client/node_modules
diff --git a/.gitignore b/.gitignore
@@ -23,11 +23,6 @@ server/common/web/static/*
 server/common/web/templates/
 server/common/web/csp-hashes.json
 
-# ecs build
-artifact.dir
-artifact.zip
-customize
-
 # Jupyter Notebook
 .ipynb_checkpoints
 *.ipynb

diff --git a/hosted/Dockerfile b/hosted/Dockerfile
@@ -29,7 +29,7 @@ RUN make build-client
 ADD server/ server/
 RUN mkdir -p /server/common/web/templates/
 
-WORKDIR server/
+WORKDIR server/ecs
 RUN make build-ecs
 WORKDIR /
 

diff --git a/hosted/start.sh b/hosted/start.sh
@@ -2,4 +2,4 @@
 
 nginx
 
-gunicorn --worker-class gevent --bind 0.0.0.0:4555 server.app:application --timeout 60
+gunicorn --worker-class gevent --bind 0.0.0.0:4555 server.ecs.app:application --timeout 60
diff --git a/server/Makefile b/server/Makefile
@@ -32,11 +32,3 @@ e2e:
 	--start-directory tests/e2e \
 	--top-level-directory .. \
 	--verbose; test_result=$$?; \
-
-
-# Bundles the application so that it can be dockerized and run in ECS
-.PHONY: build-ecs
-build-ecs:
-	$(call copy_client_assets,/../client/build,/../server/common/web) ; \
-	cp /../client/build/index.html /../server/common/web/templates/index.html ; \
-	cp -r /../client/build/* /../server/common/web/. ;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@

		nginx

		gunicorn --worker-class gevent --bind 0.0.0.0:4555 server.app:application --timeout 60
		gunicorn --worker-class gevent --bind 0.0.0.0:4555 server.ecs.app:application --timeout 60