16 Commits

Author SHA1 Message Date
Phil Proctor
ac211886f1 Dockerfile build (#727)
* Added Dockerfile run configuration and fixed manual test project to run appropriately

* Finished updates for Docker build and management of project through docker commands. Any of the dotnet CLI commands accessible through 'builder' container and default run is manual test project

* Added a docker-compose.yaml files to support commands: docker-compose run tests, docker-compose run benchmarks, docker-compose run manual-test
2018-12-26 08:30:59 -08:00
Tom Pallister
2673aebee2 ignore .DS_Store 2018-08-11 11:53:43 +01:00
Tom Pallister
1817564ea5
Feature/fix #463 (#506)
* #463 save both files

* #463 made it so we dont save to disk on startup unless using admin api
2018-07-27 23:13:22 +01:00
Tom Pallister
aa55fe34cb
Feature/merge configuration files (#316)
* #296 renamed configuration.json to ocelot.json in preparation

* removed things we dont need for tests

* another file we dont need

* removed some async we dont need

* refactoring to consolidate configuration code

* removed another pointless abstraction

* #296 started writing merge code

* #296 coming up with ideas for this config merging

* #296 still hacking this idea around

* #296 will now do a crappy merge on the configuration

* #296 change so tests pass on windows
2018-04-17 22:06:41 +01:00
Tom Pallister
3ac9b3bd87
hacked together load balancing reroutes in fileconfig (#211)
* hacked together load balancing reroutes in fileconfig

* some renaming and refactoring

* more renames

* hacked away the old config json

* test for issue 213

* renamed key

* dont share ports

* oops

* updated docs

* mvoed docs around

* port being used
2018-01-31 20:34:55 +00:00
Stuart Saltzman
9c048ba615 fix/#98 - command line build on mac (#203)
* Cake v0.25.0; git ignore .idea/ directory

* revert cake to upstream

* revert src/Ocelot/Middleware/OcelotMiddlewareExtensions.cs

* comments
2018-01-18 21:02:30 +00:00
Tom Gardham-Pallister
c3e73d42d3 updated gitignore 2017-11-25 15:40:53 +00:00
Tom Pallister
923276651d
Feature/docs (#165)
* initial readthedocs commit

* docs moved to sphinx / rst / read the docs
2017-11-25 15:03:50 +00:00
Tom Gardham-Pallister
6cdf4e67df can now use tokens from ocelot a on ocelot b when using admin area 2017-06-23 15:17:40 +01:00
TomPallister
6aefa8d1b3 specific cake version 2017-03-11 09:16:56 +00:00
TomPallister
e33fe4cf7d merged develop 2017-02-11 12:07:08 +00:00
Philip Wood
2cd69d1908 #20 - added cake build to do same functionality as batch scripts. Also does semver versioning of assemblies, if running in AppVeyor, generates release notes and publishes packages to appveyor. 2017-01-24 21:11:15 +00:00
TomPallister
9575adc90d removed vs code folder 2016-10-25 22:12:49 +01:00
TomPallister
17b24d3da5 changes to get ftp deploy working from appveyor 2016-10-13 20:40:03 +01:00
Tom Gardham-Pallister
b2c1e627bb ignore resuts 2016-08-19 21:46:48 +01:00
TomPallister
c512a772d4 after hours of pissing around on the mac...gave up..so got this configured how i wanted in VS2015 now to see if it works on the mac 2016-07-03 20:39:08 +01:00