Commit graph

1413 commits

Author SHA1 Message Date
Cassie Tarakajian
63fe883528 fix merge conflict 2018-08-21 15:39:01 -04:00
Cassie Tarakajian
ead709b256 fix linting error 2018-08-20 14:54:12 -04:00
Cassie Tarakajian
aeeeda23a2 fix #671, change forum url 2018-08-20 12:26:21 -04:00
Cassie Tarakajian
aa543fad4a merge in master 2018-08-20 12:20:41 -04:00
Cassie Tarakajian
dcb72b9b0b continue to develop kubernetes setup 2018-08-20 12:06:53 -04:00
Cassie Tarakajian
7f9a435a7f add args to Dockerfile 2018-08-13 16:40:51 -04:00
Cassie Tarakajian
ba051c2f31 try adding args to the build process and maybe this fixes it 2018-08-13 16:12:25 -04:00
Cassie Tarakajian
b06c874a00 this time actually execute the right docker command 2018-08-13 15:28:44 -04:00
Cassie Tarakajian
66d24fcbfa try to get some insight on why env variables aren't being build into image on travis 2018-08-13 14:24:02 -04:00
Cassie Tarakajian
c4b676d754 fix Dockerfile and docker-compose.yml so that image will hopefully build correctly on travis 2018-08-10 17:11:04 -04:00
Luis Morales-Navarro
3e97360c82 Update name of table output (#670) 2018-08-10 14:09:55 -04:00
Cassie Tarakajian
8f912fe8ce fix webpack configuration to create source map 2018-08-09 16:43:51 -04:00
Cassie Tarakajian
b25f0d3ab5 add ability to disable FORCE_TO_HTTPS in prod 2018-08-09 15:43:44 -04:00
Cassie Tarakajian
a1b9d394d7 try regenerating package-lock.json 2018-08-09 14:23:21 -04:00
Cassie Tarakajian
27c9ea8939 remove references to .env in docker-compose 2018-08-09 14:12:17 -04:00
Cassie Tarakajian
549d622c6f more config for kubernetes, fix example fetching tasks to include node env 2018-08-09 13:58:48 -04:00
Liang Tang
bee02e01ab bug fixes (#666) 2018-07-31 13:07:19 -04:00
Liang Tang
617f00653c Improve current console (#656)
* init v2

* make replay work

* fix a failing scenary of react-frame

* fix some bugs

* delete/comment some files

* remove

* fix some bugs && remove more comments

* remove unnecessary lines

* minor tweak

* fix some bugs

* try to hook iframe using webpack

* update

* changes according to cassie

* minor tweak

* fix lint

* extract sass

* add icons

* update webpack config

* update webpack configuration

* update

* tweak

* fix a small bug
2018-07-30 12:20:57 -04:00
Cassie Tarakajian
d53ed3c16b start to add kubernetes configuration 2018-07-26 13:18:21 -04:00
Jared Donovan
903713e705 WIP - Mixed content error for Issue #543 (#661)
* Set trust proxy option on Express app.

* Fix replacement of filePath for full screen and embed sketches.

* Use const rather than let because  is never reassigned.
2018-07-03 13:02:46 -07:00
Cassie Tarakajian
6b560fb904 in process changes to start kubernetes 2018-07-03 12:04:49 -07:00
Cassie Tarakajian
97acbf1978 change tag to docker hub to latest 2018-07-02 18:08:00 -07:00
Cassie Tarakajian
fa5a9e39b2 fix linting errors and do stuff to make build work 2018-06-26 19:13:13 -07:00
Cassie Tarakajian
82059bbfb0 remove nginx Dockerfile because it's not actually necessary 2018-06-26 19:05:08 -07:00
Cassie Tarakajian
ffeb900d89 comment out .env file 2018-06-26 14:50:21 -07:00
Cassie Tarakajian
f6f8e145d1 get the mongo authentication to workgit add . 2018-06-25 19:16:42 -07:00
Cassie Tarakajian
a7f319a727 add authentication to mongo, properly, not tested to see if it works with server 2018-06-25 18:18:40 -07:00
Cassie Tarakajian
f06198a4e1 start to add mongo configuration 2018-06-25 16:13:31 -07:00
Cassie Tarakajian
1c135635ca okay this time definitely the docker push will work 2018-06-20 13:34:09 -07:00
Cassie Tarakajian
72750e8568 try to tag docker images again 2018-06-20 12:09:54 -07:00
Cassie Tarakajian
4b78b7be5b fix docker tag command 2018-06-20 11:47:21 -07:00
Cassie Tarakajian
adebaaba45 try pushing images to docker hub 2018-06-20 11:29:13 -07:00
Cassie Tarakajian
432361bc86 fix lint errors 2018-06-20 10:28:54 -07:00
Cassie Tarakajian
d29be20395 Merge branch 'master' into production-docker 2018-06-20 10:23:13 -07:00
Cassie Tarakajian
217ae7011f try building docker images in development first for linting 2018-06-20 10:01:11 -07:00
Cassie Tarakajian
b86a4093c5 try removing before_script 2018-06-20 08:50:13 -07:00
Cassie Tarakajian
f340d2715f remove installation step from travis because it's in Dockerfile 2018-06-19 20:01:04 -07:00
Cassie Tarakajian
25aa5c77f1 remove --progress from webpack build to see if it prints error 2018-06-19 19:46:34 -07:00
Cassie Tarakajian
f7db48910c remove reference to .env file from docker-compose.yml 2018-06-19 19:22:35 -07:00
Cassie Tarakajian
d4b927f0d4 get nginx proxying working on local machine 2018-06-19 15:22:18 -07:00
Jared Donovan
9a0c044884 Fixed the linting errors that I could. (#653) 2018-06-18 14:45:50 -07:00
Cassie Tarakajian
c7ce85e0d7 fix merge conflicts 2018-06-18 14:33:57 -07:00
Cassie Tarakajian
b172087b98 get local-ssl-proxy working for testing prod locally 2018-06-18 14:32:09 -07:00
Cassie Tarakajian
a14c232935 fix fetch example scripts, add webpack config to build fetch script bundles 2018-06-18 14:32:09 -07:00
Cassie Tarakajian
131e853503 change Dockerfile to fix environment variables and fetching examples 2018-06-18 14:32:09 -07:00
Cassie Tarakajian
6dd92a1573 start to handle environment variables 2018-06-18 14:32:08 -07:00
Cassie Tarakajian
0857a52326 update .env.example and README, start to build out Docker development and prodiction setup 2018-06-18 14:32:08 -07:00
Cassie Tarakajian
2f84fe12a6 more changes to get dockerization working 2018-06-18 14:30:11 -07:00
Cassie Tarakajian
c10ae61316 start production docker configuration 2018-06-18 14:30:11 -07:00
Cassie Tarakajian
41f793b130 remove unused index.html, move example fetch to own folder 2018-06-18 14:30:10 -07:00