fixes

vangheem · Jan 22, 2021 · 94e800f · 94e800f
1 parent 8b929fd
commit 94e800f
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 14 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,10 @@
+app
+lib
+bin
+.pytest-cache
+.vscode
+cov.pem
+coverage.xml
+.env.dev
+htmlcov
+conf
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,10 @@
 .coverage
 build/
-downloads/
 fs/
-image/
-pdf/
 *.swp
 .mypy_cache/
+.env.dev
+cov.pem
+.vscode
+coverage.xml
+htmlcov
diff --git a/Dockerfile b/Dockerfile
@@ -21,5 +21,4 @@ RUN make install
 
 EXPOSE 5000
 
-RUN mkdir /conf
 CMD ["make", "run"]
diff --git a/app/.dockerignore b/app/.dockerignore
@@ -1 +1,2 @@
- node_modules
+ node_modules
+
diff --git a/build.yaml b/build.yaml
diff --git a/conf/nginx-templates/default.conf.template b/conf/nginx-templates/default.conf.template
@@ -0,0 +1,13 @@
+server {
+    listen       80;
+    listen  [::]:80;
+
+    server_name  _;
+
+    location / {
+        proxy_pass http://frontend:3000;
+    }
+    location /api {
+        proxy_pass http://api:8000/api;
+    }
+}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -21,5 +21,4 @@ RUN make install

		EXPOSE 5000

		RUN mkdir /conf
		CMD ["make", "run"]