31 Commits

Author SHA1 Message Date
18063aabab conflict 2019-11-11 11:32:38 +00:00
f3ed56f0e1 trying to get this to deploy 2019-11-11 12:30:09 +01:00
5eda33d47c removed app.conf 2019-10-31 23:33:46 +00:00
708cd8f0e7 nginx 2019-11-01 00:33:13 +01:00
db6d842d2a conflict 2019-10-31 23:24:05 +00:00
217a31ed0c removed app.conf 2019-10-31 23:23:10 +00:00
ea60fcdc68 nginx 2019-11-01 00:22:36 +01:00
24083e5d6d ports 2019-11-01 00:14:24 +01:00
92a25e0ec0 8000 2019-11-01 00:00:02 +01:00
ce7891f2c2 don't use 80 and 443 ports in both nginx and app 2019-10-31 23:56:28 +01:00
edb958c24c removed redundant command sfrom Dockerfile 2019-10-31 23:47:32 +01:00
bb70c8aad5 removed redundant command sfrom Dockerfile 2019-10-31 23:45:50 +01:00
6596bdc7d1 env.prod 2019-10-31 23:40:03 +01:00
0a2635052a Merge branch 'master' of https://github.com/zevaverbach/personal_api 2019-10-31 23:32:37 +01:00
94190179af gitignore 2019-10-31 22:32:23 +00:00
fec1b3ff7c standard ports 2019-10-31 23:25:45 +01:00
f26a360c23 my network 2019-10-31 23:22:15 +01:00
e83855fd63 my network 2019-10-31 23:21:01 +01:00
24949a2d80 add alias 2019-10-31 23:19:58 +01:00
858c9ff736 add alias 2019-10-31 23:17:42 +01:00
1f72f9ece7 Merge branch 'master' of https://github.com/zevaverbach/personal_api
 Conflicts:
	docker-compose.yml
2019-10-31 23:15:27 +01:00
c9b6312829 docker-compose 2019-10-31 23:15:02 +01:00
0775c69c78 added data folder and fixed typo 2019-10-31 22:14:11 +00:00
a8afb8882d docker-compose 2019-10-31 22:37:04 +01:00
14b83949e0 Docker 2019-10-30 19:39:16 +01:00
bd209f0137 made a requirements.txt 2019-10-30 16:53:23 +01:00
8628c375ec readme 2019-10-30 15:21:43 +01:00
479c6cd7dc readme 2019-10-30 15:06:32 +01:00
2bec0e1b50 Merge branch 'master' of https://github.com/zevaverbach/personal_api 2019-10-30 14:47:39 +01:00
Zev Averbach
082c6c040f Initial commit 2019-10-30 14:46:03 +01:00
892c80861c first 2019-10-30 14:45:02 +01:00