github.com/docksal/service-vhost-proxy commits

Mute command output for "make exec/exec-it/shell"

Also fix "make shell"

bb54307b398867720c84a35460578b51959f6771 authored over 6 years ago by Leonid Makarov <[email protected]>

Updated Makefile and tests

- Use make commands where possible
- Added test cases for custom certs with standalone containers

6e29e6d6ab7505c224108b39848f667545c52a5f authored over 6 years ago by Leonid Makarov <[email protected]>

Custom certs support for standalone containers

Fixed the template and added support for custom certs

5090df7a6bb742af115a9c9baa1396968583848b authored over 6 years ago by Leonid Makarov <[email protected]>

Merge pull request #30 from docksal/feature/custom-certs

Custom certs support

78030bd2f64c1b94b6e2f1cbb367db4ff6f20d78 authored over 6 years ago by Leonid Makarov <[email protected]>

Handle "io.docksal.cert-name" == "none"

Needs to be unset (set to nil) for the rest of the logic to work correctly.

853f1e7c3c8259a76b1fcfda32f39efd8e8c5e61 authored over 6 years ago by Leonid Makarov <[email protected]>

Added tests for custom certs

3de47e250144164755e95e61ef66cd7628fc4162 authored over 6 years ago by Leonid Makarov <[email protected]>

Added support for custom certs

cbe4ca65d806a07ac918e2c5b8c7d227abd150de authored over 6 years ago by Leonid Makarov <[email protected]>

Use CN=*.docksal for the embedded self-signed cert

5fd7e258f38e45374450a41c417e32ec89ae8d42 authored over 6 years ago by Leonid Makarov <[email protected]>

Merge pull request #28 from docksal/feature/openresty

Switch to OpenResty

e1286254ab1f883be0fc69054d825a381457ab42 authored over 6 years ago by Leonid Makarov <[email protected]>

Code style updates for nginx and Lua

Indent with tabs in nginx configs

9c3848d75e4c3bf6cac2de32ac74b0faa51622fd authored over 6 years ago by Leonid Makarov <[email protected]>

Fixed the issue with project start over HTTPS (HTTP/2)

- Replaced ngx.location.capture with io.open
- Removed proxyctl.conf.tmpl as it is no longer nec...

39ec4e6fc4de55273017b8feac377c5be69e0655 authored over 6 years ago by Leonid Makarov <[email protected]>

Proper handling os.execute return values in Lua 5.2

d5cabe341e7a8ee923d10655b913c4408ac6471a authored over 6 years ago by Leonid Makarov <[email protected]>

License year update

eaddb6d1e0c6df05d0e82152e5a722913f342124 authored over 6 years ago by Leonid Makarov <[email protected]>

Refactored Dockerfile

- Use the "; \" style RUN commands
- Cleanup docker binaries from the docker client download (tr...

abbfc21362a2a23897edbc2c66ecddd49ed1ee5b authored over 6 years ago by Leonid Makarov <[email protected]>

Switch to OpenResty (Alpine 3.7)

- Switched to FROM openresty/openresty:alpine
- Reorganized nginx config files
- Moved Lua code ...

4b6a965d191381afa46d4a7140b8a1fd7f732169 authored over 6 years ago by Leonid Makarov <[email protected]>

Switch from gotpl to gomplate

36829c53e74bbdbdfbd3a4427f67a1a48b009673 authored over 6 years ago by Leonid Makarov <[email protected]>

proxyctl: fix restarting stopped projects

Disconnect/reconnect project containers to project network in start/stop

b0f3dba34b19081220bbdf65312f04046e3f9de9 authored over 6 years ago by Leonid Makarov <[email protected]>

Update make start command to pass IMAGE_VHOST_PROXY

7393bcb182822b81e8098fb8e2d1e3191a4e1b64 authored over 6 years ago by Leonid Makarov <[email protected]>

Switch to Docker 18.03.01

136a17c8e959333990e1a5855a69734254d31dbc authored over 6 years ago by Leonid Makarov <[email protected]>

Version updates

- docker 17.09.1-ce
- docker-gen 0.7.4

360c6b3881e9c2af1b7f53f2efeb32e4edb73d0f authored almost 7 years ago by Leonid Makarov <[email protected]>

README updates

7db7fc6402d06f0be1182aca5146891390603491 authored almost 7 years ago by Leonid Makarov <[email protected]>

Pushing images to Docker Hub via Travis

3c6f1745f3cc1d9afe7351d53fbee0ea72863b53 authored almost 7 years ago by Leonid Makarov <[email protected]>

Fix tests

4fb36b6386477b037816460e02263150256a2302 authored almost 7 years ago by Leonid Makarov <[email protected]>

Added virtual-port tests

- "Proxy can route request to a non-default port (project)"
- "Proxy can route request to a non-...

7d506bda49f0b3d0f237f1021ce3c5a43ebc09bc authored almost 7 years ago by Leonid Makarov <[email protected]>

Extended make cleanup

- removing the projects directory
- running fin cleanup

7ff0e467aafe8150d44f8a81d40e0f4f36084ff9 authored almost 7 years ago by Leonid Makarov <[email protected]>

Updated README

ba3adfa169f1aeb2641f9aa18afc58635c255b9d authored almost 7 years ago by Leonid Makarov <[email protected]>

Using protocol-relative URLs in loading and not-found screens

ab67c90f045917c5888f6e009ac2aaee879a3891 authored almost 7 years ago by Leonid Makarov <[email protected]>

Multiple fixes in tests

- addressed race conditions between tests and cron jobs inside the container
- fin aliases can n...

9af1e6447bb1329bb6089efb8375d8fde81d8aba authored almost 7 years ago by Leonid Makarov <[email protected]>

proxyctl updates

- exposed proxyctrl stats command
- fixed debug output of configs
- added logging in cron()

d17ec715e3d3b962bf66641ad0aa0fc1802ed152 authored almost 7 years ago by Leonid Makarov <[email protected]>

Added .gitignore

c462abf8ab0cc6af66eee3fee2ed0796849fe203 authored almost 7 years ago by Leonid Makarov <[email protected]>

Fixing HTTP/2 tests (#17)

5f8ecf15a7e019c3c93e73df1eabdbe2f351d073 authored almost 7 years ago by Leonid Makarov <[email protected]>

Minor tests update

Use http://nonsense.docksal for a non-existing project test case.

fc72be6d6d5f5be4979683ee863537c75e312e72 authored almost 7 years ago by Leonid Makarov <[email protected]>

HTTP/2 support. Fixes #17

46abdccf00cc247e2f8e9ff48587c688ab9de8c5 authored almost 7 years ago by Leonid Makarov <[email protected]>

Switch back to docksal/develop

69eabc72befb791bab6c85ed1c69fce7183100b1 authored almost 7 years ago by Leonid Makarov <[email protected]>

Enabled logging and increase wait time in tests

22e5a6398e52d55a263c76d35997540a4236f295 authored almost 7 years ago by Leonid Makarov <[email protected]>

Test case: Projects directory mounted correctly

93aa45afbd8128b151516613dedd5b1dd3777570 authored almost 7 years ago by Leonid Makarov <[email protected]>

fin: feature/docksal-projects-volume

39e1fffa0defe68d6abc7d50ec4735fee5cb24eb authored almost 7 years ago by Leonid Makarov <[email protected]>

Big refactoring

- proxyctl start/stop
- updated and fixed tests
- using plain HTML projects instead of drupal7/d...

7f3b0933ca91ab5902e959ab423ba6a37001c119 authored almost 7 years ago by Leonid Makarov <[email protected]>

Updating tests

d15ba874960872a7f067e730daa4e24eebf09248 authored almost 7 years ago by Leonid Makarov <[email protected]>

Give configs and template more meaningful names

ae19312956740c6a1bad41498a152709213dbd36 authored almost 7 years ago by Leonid Makarov <[email protected]>

Virtual port configuration via io.docksal.virtual-port label

Now virtual port is configuration via io.docksal.virtual-port label instead of VIRTUAL_PORT env ...

ffe53921366245271b5326148ff0fb8f470b54e2 authored almost 7 years ago by Leonid Makarov <[email protected]>

Adjust default.conf.tmpl template

Make generated nginx config more readable

45e168f446fe6b542b0f3cddf506d051dade409d authored almost 7 years ago by Leonid Makarov <[email protected]>

Updated logging configuration variables

- Renamed PROXY_ACCESS_LOG to ACCESS_LOG
- Renamed PROXY_DEBUG to DEBUG_LOG
- Added STATS_LOG

f6a3eca6f57708e383777dd2f37d0c92e8b892dd authored almost 7 years ago by Leonid Makarov <[email protected]>

Removed the dependency on "web" (docksal/docksal#427)

Use label=io.docksal.project-root (instead of label=com.docker.compose.service=web) as the prima...

2297d4f669dc878d68693c0dff13bc44dfd518d7 authored almost 7 years ago by Leonid Makarov <[email protected]>

Fix "simple variable usage" warning in PHPStorm

8428f9c77d19b6e3d9e6273aba26e9d349d94d81 authored almost 7 years ago by Leonid Makarov <[email protected]>

Switch to dev version of Docksal

ecffdba335c8271b6fe540b98ea9ae31855b7b98 authored almost 7 years ago by Leonid Makarov <[email protected]>

Adjust cron schedule

- Run cron every minutes
- Run cleanup every hour
- Run stop then stats on cron

d8fdf2686008c18ff400edb303ab4c84876d32ef authored almost 7 years ago by Leonid Makarov <[email protected]>

Switched to boolean values in stats

da1d928a31eff206df34ed39c1750d1daa556a24 authored about 7 years ago by Leonid Makarov <[email protected]>

Run cron every minute

94e294773fa7f2dada025bc62385476019efa2bb authored about 7 years ago by Leonid Makarov <[email protected]>

Added aggregated stats for projects

4a162177c7dc8c756673af04f411193f0e4b52cf authored about 7 years ago by Leonid Makarov <[email protected]>

Fix typo

fecfc51d7e87ed2721e839353c84251a8a349285 authored about 7 years ago by Leonid Makarov <[email protected]>

Replaces spaces with tabs in smoke-test.bats

529b15587fe91bc5323f6fed2285fd0c4a5f97b0 authored about 7 years ago by Leonid Makarov <[email protected]>

Refactoring

- stats now include: project_name, created, status, permanent, active, dangling
- removed leadin...

5a36e854fc16a9cd1870e7e10d3d7035e2f5f8d4 authored about 7 years ago by Leonid Makarov <[email protected]>

Added projects stats in logs

Project starts are printed every time _cron is triggered (every 5 minutes at the moment).
Prints...

d12316419764e00d9cbb37658b11157c159c233c authored about 7 years ago by Leonid Makarov <[email protected]>

Reduce crond log verbosity to default

a2b0bea208c2ac9d93f918898ab2b424c6b4441b authored about 7 years ago by Leonid Makarov <[email protected]>

Get rid of /usr/bin/ in proxyctl

This was only necessary in _start(), which is triggered by lua in nginx and did not have the nec...

4806cb539f37ca604688c4ffc8ae4f8594daa6ab authored about 7 years ago by Leonid Makarov <[email protected]>

PROXY_ACCESS_LOG variable

- Make it possible to turn access logging in nginx on/off (off by default) using env PROXY_ACCES...

2784d19ae63bcd3b82042393731fe01a5f4b5223 authored about 7 years ago by Leonid Makarov <[email protected]>

Use ARG instead of ENV for versions

8a418bdc05737678f7d9e6ec653c87f465011d5b authored about 7 years ago by Leonid Makarov <[email protected]>

Merge pull request #19 from docksal/proxy-buffers

Increase proxy buffers to 256k

54a9c7005074175c49361abed3d4a25740bb542b authored about 7 years ago by Leonid Makarov <[email protected]>

Increase proxy buffers https://stackoverflow.com/a/13896157/1359178

af32e8f5ba9f8e92b313878ba1d1de7a8f24d667 authored about 7 years ago by Alexei Chekulaev <[email protected]>

Removing legacy "OS: linux" from .travis.yml

b16de18304b693fa3a8a732d7463483641338a7b authored over 7 years ago by Leonid Makarov <[email protected]>

supervisord.conf adjustments

- Made supervisord complain even less with `user = root`
- Adjusted crond logging level to have ...

8b9eead6be0b073ac7910894a42e3f8abb5b083d authored over 7 years ago by Leonid Makarov <[email protected]>

Added timestamp in logs from proxyctl

b1ed7f83af9590767c36f4feb7198be348447766 authored over 7 years ago by Leonid Makarov <[email protected]>

User /etc/supervisord.conf directly

Override the main supervisord config file, since some parameters are not overridable via an incl...

dd6fe1785c3a06cc4402bae0c26a1ee6cea3f472 authored over 7 years ago by Leonid Makarov <[email protected]>

Minor working changes in tests

5fb8dd307ed038b0c87109040da4b0cbc4b116c6 authored over 7 years ago by Leonid Makarov <[email protected]>

Rename IMAGE_VHOST_PROXY to IMAGE_NAME

45a008e0ed5b5c3bf36b325c74c5e71579623ba8 authored over 7 years ago by Leonid Makarov <[email protected]>

Refactoring

- Switched to docker v17.06.0-ce
- Misc. Dockerfile updates and optimizations
- Updated supervis...

1c0c13cde46e6196b8960d64c875c17979335c51 authored over 7 years ago by Leonid Makarov <[email protected]>

Route error output from docker log to stdout

Without this, error logs are not accounted for when deciding whether a web container (and thus t...

bdbcc466a8513fd68e408725777e3ca331583f83 authored over 7 years ago by Leonid Makarov <[email protected]>

proxy_busy_buffers_size 8k

Otherwise nginx complains:
[emerg] 17#0: "proxy_busy_buffers_size" must be less than the size of...

12526082e0524f1b9b39afba004f8875b5f67ae2 authored almost 8 years ago by Leonid Makarov <[email protected]>

Fix tests

Use the stable fin version from master

7963c7dae0a9624efbff78102a3a12412b722c50 authored almost 8 years ago by Leonid Makarov <[email protected]>

Fix "upstream sent too big header while reading response header from upstream" (#12)

032b75903a2a43eeb4c2df0b852766ddfacec83f authored almost 8 years ago by Alexei Chekulaev <[email protected]>

Additional delay in bats

Should fix the "Proxy cleaned up projects after "60s" of inactivity" test

db9fd8212532fd692e590a6055a237a0699deb09 authored almost 8 years ago by Leonid Makarov <[email protected]>

README.md

Also removed MAINTAINER in Dockerfile as soon to be deprecated.

ef678364a4627c00c9b22a05b3937149e208dc09 authored almost 8 years ago by Leonid Makarov <[email protected]>

Replaced spaced with tabs in proxyctl

395d7f2ce94d0478c24387e8ab45d6a46a6a578d authored almost 8 years ago by Leonid Makarov <[email protected]>

Fix bats (#11)

* Use full answer in curl.
* Remove unnecessary projects stop/start.

12a8538f2f03c6119b8efb5d3327e2d8ead9b1ad authored almost 8 years ago by Michael Molchanov <[email protected]>

Add default host for https connection. (#10)

* Add default host for https connection. It will allow to start projects by https request, not h...

38522ebc43f96a1130b9d425cd22af701c45525d authored almost 8 years ago by Michael Molchanov <[email protected]>

License and readme updates

942e38add1ec356637e51954b715e9f06d559fba authored about 8 years ago by Leonid Makarov <[email protected]>

Include stopped container in dangling containers cleaup

250e9e0a892f91768f537e281a3b1b8b7e598f97 authored about 8 years ago by Leonid Makarov <[email protected]>

bats: fixes and cleanup

1f3a2a180b1113f73ffd4e24f2ebdcf81ac726a2 authored about 8 years ago by Leonid Makarov <[email protected]>

bats: added checks for project directory cleanup

Project directory should be removed after PROJECT_DANGLING_TIMEOUT unless the project is not mar...

bb47d7bd3970c5ff36ad07cfffff212a796d8d66 authored about 8 years ago by Leonid Makarov <[email protected]>

bats: renamed variables, cleanup

038293de632fbeb4d58b256492802b29f2f336b0 authored about 8 years ago by Leonid Makarov <[email protected]>

Test for io.docksal.permanent=true flag

34319a932e58a213ab7c51a865b505fd9c5c85a6 authored about 8 years ago by Leonid Makarov <[email protected]>

Disable inactivity and dangling timeouts by default

Also update tests

3bf72198c06c0c9e5039f7c800a95608399117d4 authored about 8 years ago by Leonid Makarov <[email protected]>

Test updates

Rewrote some tests
Run docker commands with fin to simplify testing on Mac.
Added SKIP option in...

094bc39aa6a9afd9467b0bc0aac53628132f916f authored about 8 years ago by Leonid Makarov <[email protected]>

.travis.yml updates

d617c95cb1915b5b3b57ccd5e92dc9e2976b086d authored about 8 years ago by Leonid Makarov <[email protected]>

Bats tests (#9)

031dec9198900e78a0db34f992bed671e0610b8c authored about 8 years ago by Michael Molchanov <[email protected]>

Dangling project cleanup feature. (#8)

bc24911b6ccd0e79e233907ec82da24ae71afb07 authored about 8 years ago by Michael Molchanov <[email protected]>

Fix exec permissions on startup.sh

ca1af543c17534a946f8c6809cb5509c0a00a964 authored about 8 years ago by Leonid Makarov <[email protected]>

Fix single container start. Wrong condition.

306c422546f6f092160efb05b8e9b03864da4dd4 authored about 8 years ago by Michael Molchanov <[email protected]>

Connect projects networks on proxy start or reset. Allow to reset proxy on actively used environment.

2cc30d0610faf90d95787929b1154f8bcae5c6e1 authored about 8 years ago by Michael Molchanov <[email protected]>

Increase delay before reload to allow docker-gen generate and nginx reload config file.

d1988fb333625c3e67b3a141bce26670571a84d2 authored about 8 years ago by Michael Molchanov <[email protected]>

Allow to start non docksal docker-compose projects, allow to start standalone docker containers, disable docker-gen during start of containers.

f75832f062490dec175858a55dabe8d399fab252 authored about 8 years ago by Michael Molchanov <[email protected]>

Update proxy container name to docksal-vhost-proxy

e2721eda6c90fc09f7a875148f29146cb784e4ff authored about 8 years ago by Leonid Makarov <[email protected]>

ENV INACTIVITY_TIMEOUT 24h

39719ad898ca81439fcb2c27230a85de6a50198f authored about 8 years ago by Leonid Makarov <[email protected]>

Docker 1.12.3

7b59262349165b34df68ddb66b47c77071674f4f authored about 8 years ago by Leonid Makarov <[email protected]>

Update maintainer

a6bcdd49576fdf4bd7f7d8138e7dc0b6a19d36ce authored about 8 years ago by Leonid Makarov <[email protected]>

Added support for proxying standalone containers (not part of a docker-compose project) #5

01c68097fcdc15276b7e30b1b8eb454b493f40cb authored about 8 years ago by Michael Molchanov <[email protected]>

Better network management. Fixes #6

This removes the limit on the total number of inactive environments per host (about 30).
The lim...

895b7ae9c1632c1bb5014499647ddb0f1c66cbea authored about 8 years ago by Leonid Makarov <[email protected]>

Added docker-gen trigger via a dummy container back

0757d48dfd30674ce608f3bca95a54717c7d1947 authored about 8 years ago by Leonid Makarov <[email protected]>

Cleanup

24826d329c0047dba120e80abcc96120a5a6ca88 authored about 8 years ago by Leonid Makarov <[email protected]>

Ecosyste.ms: OpenCollective

github.com/docksal/service-vhost-proxy