Commit Graph

39 Commits

Author SHA1 Message Date
Alfred Gutierrez a72ccbdad8
Update README.md 2018-11-21 22:59:35 -08:00
Alfred Gutierrez fcba6ed18d
Merge pull request #16 from alfg/feature/ssl
Add nginx ssl support
2018-11-21 22:56:22 -08:00
Alf 3257fdcfb6 Update readme with ssl docs. Updated nginx.conf. 2018-11-21 22:54:46 -08:00
Alf 09f63f98d0 Update readme 2018-11-20 18:13:15 -08:00
Alf 414a29bbf0 Updated readme.g 2018-11-20 17:26:10 -08:00
Alf e6e9e6cc7d Add nginx ssl support with self-signed cert examples. Updated readme with ssl note. 2018-11-20 17:10:34 -08:00
Alf 95e0b06d46 NGINX v1.14.1. FFmpeg v4.1. 2018-11-10 20:26:54 -08:00
Alfred Gutierrez 76a08d509f
Update README.md 2018-09-30 19:23:27 -07:00
Alfred Gutierrez 0cd554f010
Merge pull request #13 from alfg/multistage-build
Add multistage docker build.
2018-09-30 03:09:56 -07:00
Alf 64dcb9f0ae update dockerfile 2018-09-30 02:03:54 -07:00
Alf 9bbc25b11a Add multistage docker build. 2018-09-29 23:29:25 -07:00
Alfred Gutierrez ed1c16f192
Update Dockerfile 2018-09-12 20:10:00 -07:00
Alfred Gutierrez b10325c932
Merge pull request #8 from alfg/nginx-version-cleanup
Bump nginx version and syntax cleanup
2018-03-05 22:09:54 -08:00
Alf e7d229abd5 Fix syntax. 2018-03-05 21:19:59 -08:00
Alf 3784bcc51b Updated readme. 2018-03-05 21:16:02 -08:00
Alf c63f1a7713 Bump NGINX version and cleanup syntax formatting. 2018-03-05 21:14:40 -08:00
Alfred Gutierrez 82280a1462
Merge pull request #6 from alfg/feature/update-alpine-3.4
Update Alpine to 3.4. Version bumps for ffmpeg, nginx, and nginx-rtmp
2018-02-17 21:25:34 -08:00
Alf adf6afa3ed Update Alpine to 3.4. Version bumps for ffmpeg, nginx, and nginx-rtmp-module. 2018-02-17 21:11:07 -08:00
Alfred Gutierrez 6092a91c0e
Update README.md 2017-11-16 14:13:16 -08:00
Alfred Gutierrez 55afa4bf7e Update Dockerfile 2017-10-13 22:43:53 -07:00
Alfred Gutierrez 99f7f42ff5 Update README.md 2017-06-20 21:07:06 -07:00
Alfred Gutierrez fdca2e7a9d Update Dockerfile 2017-06-19 23:21:52 -07:00
Alfred Gutierrez 9787104c9d Update README.md 2017-01-15 15:35:00 -08:00
alf a23b6e65b0 Switch to alpine image 3.3. 2017-01-06 00:11:36 -08:00
alf eb57fc9706 Revert to see if this works. 2017-01-05 23:59:46 -08:00
alf 6bc348d08d Fix build. 2017-01-05 23:14:50 -08:00
alf 0e60ff3512 Merge branch 'master' of github.com:alfg/docker-nginx-rtmp 2017-01-05 23:00:54 -08:00
alf 2409ea5979 Add ssl and http2 modules to nginx build. 2017-01-05 23:00:38 -08:00
Alfred Gutierrez a16169684c Update README.md 2016-11-23 13:55:17 -08:00
alf c27f307be7 Merge branch 'master' of github.com:alfg/docker-nginx-rtmp 2016-11-05 20:58:29 -07:00
alf 5c76430142 Update nginx url naming convention. Add alias. 2016-11-05 20:58:21 -07:00
Alfred Gutierrez 0e2a2d8463 Update README.md 2016-11-05 13:28:56 -07:00
alf 9ad4590724 Update nginx and ffmpeg versions. 2016-10-26 20:36:42 -07:00
alf 24a1ac133a fix travis build. 2016-10-23 20:13:55 -07:00
alf c0ed521d69 Update readme. 2016-10-23 20:07:57 -07:00
alf 2ca88c56c9 dockerfile cleanup. 2016-10-23 20:03:32 -07:00
alf 1818bc2b83 Update readme. Add travis ci. 2016-10-23 20:03:08 -07:00
alf eff52a00de minor updates. 2016-10-23 19:17:32 -07:00
alf fdcafae6ed first commit 2016-10-23 18:49:28 -07:00