Commit Graph

61 Commits

Author SHA1 Message Date
Albatroz Jeremias 1bb1e4ccb7 setup streams 2020-01-16 23:01:17 +00:00
Albatroz Jeremias de96868789 change test_rtmp to receive stream as param 2020-01-16 22:58:31 +00:00
Albatroz Jeremias 0b200f4fb7 reset readme 2020-01-15 22:17:03 +00:00
Albatroz Jeremias cbfcf94e2b add script to test rtmp 2020-01-15 22:07:26 +00:00
Albatroz Jeremias 9d903043b4 moving files around 2020-01-15 22:01:31 +00:00
Albatroz Jeremias 036160a0a3 add frontpage 2020-01-15 17:25:12 +00:00
Alfred Gutierrez 73f7698aeb
Merge pull request #36 from alfg/fix-nginx-path
Update NGINX prefix and conf paths
2019-10-25 21:13:45 -07:00
Alfred Gutierrez 205b5ec387
Update dockerimage.yml 2019-10-25 21:06:29 -07:00
Alf 81a104121e Update NGINX prefix and conf paths. Bump NGINX to 1.16.1 and FFmpeg to 4.2.1. 2019-10-25 20:55:28 -07:00
Alfred Gutierrez 240e68b92e
Update dockerimage.yml 2019-09-11 23:28:47 -07:00
Alfred Gutierrez 53daac6fae
Update README.md 2019-08-26 23:52:31 -07:00
Alfred Gutierrez 5e3a84f4d0
Merge pull request #33 from alfg/FFmpeg-4.2
FFmpeg 4.2
2019-08-26 23:43:23 -07:00
Alfred Gutierrez 6561143257
FFmpeg 4.2 2019-08-26 23:25:49 -07:00
Alfred Gutierrez 4bfc120d17
Merge pull request #28 from alfg/log-level
Update logging level for rtmp and http
2019-06-03 22:44:25 -07:00
Alf ba10572bce Set rtmp log level to info. Add http access_log as combined. Both log to stdout (since this is docker) instead of file. 2019-06-03 22:42:39 -07:00
Alfred Gutierrez 948795b908
Merge pull request #24 from alfg/fix/ffmpeg-configure-warnings
Fix FFmpeg ./configure warnings by installing coreutils.
2019-05-14 20:40:30 -07:00
Alf 6350fc73c1 Fix FFmpeg ./configure warnings by installing coreutils. 2019-05-14 20:23:10 -07:00
Alf 6e3bd81ff5 Update to NGINX version 1.16.0. Update to FFmpeg version 4.1.3. 2019-04-27 12:38:35 -07:00
Alfred Gutierrez b70b736f7e
Merge pull request #21 from alexholliz/master
Updating libfdk-aac.so.1 copy command to libfdk-aac.so.2
2019-02-25 13:34:27 -08:00
Alex Hollis e3b780dca6 Updating libfdk-aac.so.1 copy command to libfdk-aac.so.2 2019-02-25 14:41:42 -06:00
Alf 76926c698c Use alpine:3.8. Updated nginx version to 1.14.2. 2019-02-02 20:56:10 -08:00
Alfred Gutierrez a37e33f2ad
Tab --> space 2019-01-21 21:29:17 -08:00
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