Jonathan Math
|
c2185c22c7
|
alter docker-compose file to use 29019 for mongo
|
2020-10-25 12:48:17 +07:00 |
|
Jonathan Math
|
67e644aab0
|
change mongodb port for docker build and fix celeryapp.py
|
2020-10-25 12:36:58 +07:00 |
|
Jonathan Math
|
55014fdc1b
|
change db_monitor port
|
2020-10-25 12:26:41 +07:00 |
|
Jonathan Math
|
8b9d92b827
|
roll back changes for redis port because the initial change didn't work. Will figure out what needs to be done differently
|
2020-10-25 12:14:34 +07:00 |
|
Jonathan Math
|
cc72ae588e
|
Merge branch 'docker_django3.0' of https://github.com/samuelclay/NewsBlur into docker_django3.0
|
2020-10-25 11:59:38 +07:00 |
|
Jonathan Math
|
defe294fb3
|
fix haproxy issue
|
2020-10-25 11:59:26 +07:00 |
|
Jonathan Math
|
54dfbe9c41
|
change redis port to 6579 when DOCKERBUILD is an env variable
|
2020-10-24 19:43:17 +07:00 |
|
Jonathan Math
|
5877fd979e
|
missed some mimetype edits in django upgrade
|
2020-10-24 19:25:26 +07:00 |
|
Jonathan Math
|
f2811cb2d7
|
update README for new test_settings location
|
2020-10-24 19:23:05 +07:00 |
|
Jonathan Math
|
340024e930
|
get rid of 'The host 0.0.0.0:8000 does not belong to the domain nb.local.com, unable to identify the subdomain for this request' issue in the logs
|
2020-10-24 19:20:45 +07:00 |
|
Jonathan Math
|
d7a7e11b0f
|
add missing import for timezones to timezone_tests/tests.py
|
2020-10-13 22:13:06 +07:00 |
|
Jonathan Math
|
a81be828d0
|
fix testrunner issues
|
2020-10-13 22:12:40 +07:00 |
|
Jonathan Math
|
39518e265f
|
vendorize rfc822 for python3 and work on fixing reverend tests
|
2020-10-13 22:12:03 +07:00 |
|
Jonathan Math
|
8437b2605c
|
2to3 fix
|
2020-10-13 22:11:11 +07:00 |
|
Jonathan Math
|
21651e300e
|
use newsblur_web instead of newsblur as directory name for settings file
|
2020-10-13 22:10:26 +07:00 |
|
Jonathan Math
|
eb31ce6bf4
|
fix test functionality for Makefile
|
2020-10-13 22:05:21 +07:00 |
|
Jonathan Math
|
7241d9118c
|
use newsblur_web instead of newsblur as directory for settings file
|
2020-10-13 22:04:24 +07:00 |
|
Jonathan Math
|
856eb299ce
|
update docker-compose file and include testing functionality
|
2020-10-13 22:03:25 +07:00 |
|
Jonathan Math
|
2c0fd0ee2e
|
use newsblur_web instead of newsblur as directory name
|
2020-10-13 22:02:55 +07:00 |
|
Jonathan Math
|
1fbec54aa8
|
python2 to python3 conversion for analyzer and push
|
2020-10-13 22:01:32 +07:00 |
|
Jonathan Math
|
9b0f3993fb
|
rm notes document... that should not be there
|
2020-10-13 10:26:26 +07:00 |
|
Jonathan Math
|
a13309b950
|
change makefile to use newsblur.test_settings instead of utils.test_settings
|
2020-10-12 12:33:13 +07:00 |
|
Jonathan Math
|
018610e3f5
|
delete moved test_settings.py
|
2020-10-12 12:32:19 +07:00 |
|
Jonathan Math
|
e063bdc7ea
|
update bootstrap.json to use nb.local.com
|
2020-10-12 12:31:35 +07:00 |
|
Jonathan Math
|
991cc3855d
|
bug fixes from missed django/python upgrade
|
2020-10-12 12:30:40 +07:00 |
|
Jonathan Math
|
d370bd5b2e
|
more node modules
|
2020-10-12 12:28:34 +07:00 |
|
Jonathan Math
|
e27ad0d69a
|
change makefile command name
|
2020-10-12 12:28:02 +07:00 |
|
Jonathan Math
|
c356782627
|
add updated node_modules
|
2020-10-12 12:27:49 +07:00 |
|
Jonathan Math
|
f1f426b9c1
|
make 2to3 changes for utils files
|
2020-10-09 12:29:53 +07:00 |
|
Jonathan Math
|
eba100f1eb
|
make 2to3 changes for utils files
|
2020-10-09 12:29:19 +07:00 |
|
Jonathan Math
|
039c7b20e9
|
clean up makefile so the default command is 'make start'
|
2020-10-09 12:28:10 +07:00 |
|
Jonathan Math
|
5b5345d35f
|
add sample opml file to config/fixtures
|
2020-10-06 22:02:54 +07:00 |
|
Jonathan Math
|
ad0ecdb8cc
|
add migration for timezone change
|
2020-10-05 16:35:26 +07:00 |
|
Jonathan Math
|
6dbc6dfbe9
|
add signals.py... not sure why I removed this, but newsblur breaks without this and paypal migrations wont work without it
|
2020-10-05 16:03:55 +07:00 |
|
Jonathan Math
|
4aea68369a
|
change celery Task import and task initialization as per the new version of celery
|
2020-10-05 00:45:57 +07:00 |
|
Jonathan Math
|
89e51a2937
|
change celery Task import and task initialization as per the new version of celery
|
2020-10-05 00:45:20 +07:00 |
|
Jonathan Math
|
0e4eb419ad
|
upgrade django-timezone-field
|
2020-10-05 00:42:06 +07:00 |
|
Jonathan Math
|
34184027a6
|
update makefile commands for django3.0
|
2020-10-05 00:40:54 +07:00 |
|
Jonathan Math
|
a8bf9c4540
|
add docker env variable functionality to node files
|
2020-10-05 00:34:40 +07:00 |
|
Jonathan Math
|
5d82414563
|
add docker_local_settings and remove unnecessary REDIS settings definition in settings.py because it is already handled in local settings
|
2020-10-05 00:19:22 +07:00 |
|
Jonathan Math
|
54e31d2597
|
update celery commands in docker-compose.yml
|
2020-10-05 00:17:09 +07:00 |
|
Jonathan Math
|
454308f0d2
|
remove unnecessary dockerfile
|
2020-10-05 00:16:37 +07:00 |
|
Jonathan Math
|
f8ee044446
|
add makefile
|
2020-10-04 17:41:35 +07:00 |
|
Jonathan Math
|
a010dfa866
|
update docker-compose.yml file to include all services
|
2020-10-04 17:41:04 +07:00 |
|
Jonathan Math
|
37586bcf6e
|
add dockerfile for haproxy and haproxy.conf
|
2020-10-04 17:40:37 +07:00 |
|
Jonathan Math
|
bb5028f568
|
add python3 docker base image
|
2020-10-04 17:40:13 +07:00 |
|
Jonathan Math
|
19c1319259
|
add node_base.Dockerfile base image
|
2020-10-04 17:39:53 +07:00 |
|
Jonathan Math
|
1f5d949cc4
|
add nginx.local.conf file for docker-compose
|
2020-10-04 17:39:20 +07:00 |
|
Jonathan Math
|
46ac2cd243
|
add import for docker_local_settings.py
|
2020-10-04 17:38:42 +07:00 |
|
Jonathan Math
|
753851f6a8
|
rename flask to flask_monitor and add import for docker settings
|
2020-10-04 17:38:02 +07:00 |
|