Updated elgohr/Publish-Docker-Github-Action to a supported version (v5)

.github/workflows/release.yml

@@ -17,7 +17,7 @@ jobs:
       - name: Go release
         uses: goreleaser/goreleaser-action@v1
       - name: Docker release
-        uses: elgohr/Publish-Docker-Github-Action@master
+        uses: elgohr/Publish-Docker-Github-Action@v5
         with:
           name: gwuhaolin/livego
           username: ${{ secrets.DOCKER_USERNAME }}

.gitignore

@@ -5,3 +5,5 @@ dist
 tmp
 vendor
 livego
+*.nohup
+/0/tmp

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:latest as builder
+FROM golang:1.13 as builder
 WORKDIR /app
 ENV GOPROXY https://goproxy.io
 COPY go.mod go.sum ./

README.md

@@ -2,10 +2,10 @@
     <img src='./logo.png' width='200px' height='80px'/>
 </p>
 
-[中文](./README_cn.md)
+<p>fork from <a href="https://github.com/gwuhaolin/livego">gwuhaolin/livego</a></p>
 
-[![Test](https://github.com/gwuhaolin/livego/workflows/Test/badge.svg)](https://github.com/gwuhaolin/livego/actions?query=workflow%3ATest)
-[![Release](https://github.com/gwuhaolin/livego/workflows/Release/badge.svg)](https://github.com/gwuhaolin/livego/actions?query=workflow%3ARelease)
+[![Test](https://github.com/Glamorgann/livego/workflows/Test/badge.svg)](https://github.com/Glamorgann/livego/actions?query=workflow%3ATest)
+[![Release](https://github.com/Glamorgann/livego/workflows/Release/badge.svg)](https://github.com/Glamorgann/livego/actions?query=workflow%3ARelease)
 
 Simple and efficient live broadcast server:
 - Very simple to install and use;
@@ -27,9 +27,6 @@ Simple and efficient live broadcast server:
 - AAC
 - MP3
 
-## Installation
-After directly downloading the compiled [binary file](https://github.com/gwuhaolin/livego/releases), execute it on the command line.
-
 #### Boot from Docker
 Run `docker run -p 1935:1935 -p 7001:7001 -p 7002:7002 -p 8090:8090 -d gwuhaolin/livego` to start
 

bootstrap.sh

@@ -0,0 +1 @@
+nohup ./livego --api_addr=:50010 --httpflv_addr=:50013 --rtmp_addr=:50011 --hls_addr=:50012 --flv_dir=./0/tmp > 0.nohup 2>&1 &

configure/channel.go

@@ -3,7 +3,7 @@ package configure
 import (
 	"fmt"
 
-	"github.com/gwuhaolin/livego/utils/uid"
+	"github.com/Glamorgann/livego/utils/uid"
 
 	"github.com/go-redis/redis/v7"
 	"github.com/patrickmn/go-cache"

container/flv/demuxer.go

@@ -2,7 +2,7 @@ package flv
 
 import (
 	"fmt"
-	"github.com/gwuhaolin/livego/av"
+	"github.com/Glamorgann/livego/av"
 )
 
 var (

container/flv/muxer.go

@@ -7,11 +7,11 @@ import (
 	"strings"
 	"time"
 
-	"github.com/gwuhaolin/livego/av"
-	"github.com/gwuhaolin/livego/configure"
-	"github.com/gwuhaolin/livego/protocol/amf"
-	"github.com/gwuhaolin/livego/utils/pio"
-	"github.com/gwuhaolin/livego/utils/uid"
+	"github.com/Glamorgann/livego/av"
+	"github.com/Glamorgann/livego/configure"
+	"github.com/Glamorgann/livego/protocol/amf"
+	"github.com/Glamorgann/livego/utils/pio"
+	"github.com/Glamorgann/livego/utils/uid"
 
 	log "github.com/sirupsen/logrus"
 )
@@ -20,31 +20,6 @@ var (
 	flvHeader = []byte{0x46, 0x4c, 0x56, 0x01, 0x05, 0x00, 0x00, 0x00, 0x09}
 )
 
-/*
-func NewFlv(handler av.Handler, info av.Info) {
-	patths := strings.SplitN(info.Key, "/", 2)
-
-	if len(patths) != 2 {
-		log.Warning("invalid info")
-		return
-	}
-
-	w, err := os.OpenFile(*flvFile, os.O_CREATE|os.O_RDWR, 0755)
-	if err != nil {
-		log.Error("open file error: ", err)
-	}
-
-	writer := NewFLVWriter(patths[0], patths[1], info.URL, w)
-
-	handler.HandleWriter(writer)
-
-	writer.Wait()
-	// close flv file
-	log.Debug("close flv file")
-	writer.ctx.Close()
-}
-*/
-
 const (
 	headerLen = 11
 )

container/flv/tag.go

@@ -3,7 +3,7 @@ package flv
 import (
 	"fmt"
 
-	"github.com/gwuhaolin/livego/av"
+	"github.com/Glamorgann/livego/av"
 )
 
 type flvTag struct {

container/ts/muxer.go

@@ -3,7 +3,7 @@ package ts
 import (
 	"io"
 
-	"github.com/gwuhaolin/livego/av"
+	"github.com/Glamorgann/livego/av"
 )
 
 const (

container/ts/muxer_test.go

@@ -3,7 +3,7 @@ package ts
 import (
 	"testing"
 
-	"github.com/gwuhaolin/livego/av"
+	"github.com/Glamorgann/livego/av"
 
 	"github.com/stretchr/testify/assert"
 )

go.mod

@@ -1,18 +1,29 @@
-module github.com/gwuhaolin/livego
+module github.com/Glamorgann/livego
 
 go 1.13
 
 require (
-	github.com/auth0/go-jwt-middleware v0.0.0-20190805220309-36081240882b
+	github.com/auth0/go-jwt-middleware v0.0.0-20201030150249-d783b5c46b39
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
-	github.com/go-redis/redis/v7 v7.2.0
-	github.com/gorilla/mux v1.7.4 // indirect
-	github.com/kr/pretty v0.1.0
+	github.com/fsnotify/fsnotify v1.4.9 // indirect
+	github.com/go-redis/redis/v7 v7.4.0
+	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
+	github.com/kr/pretty v0.2.1
+	github.com/kr/text v0.2.0 // indirect
+	github.com/magiconair/properties v1.8.4 // indirect
+	github.com/mitchellh/mapstructure v1.4.0 // indirect
 	github.com/patrickmn/go-cache v2.1.0+incompatible
+	github.com/pelletier/go-toml v1.8.1 // indirect
 	github.com/satori/go.uuid v1.2.0
-	github.com/sirupsen/logrus v1.5.0
-	github.com/spf13/pflag v1.0.3
-	github.com/spf13/viper v1.6.3
+	github.com/sirupsen/logrus v1.7.0
+	github.com/spf13/afero v1.5.1 // indirect
+	github.com/spf13/cast v1.3.1 // indirect
+	github.com/spf13/jwalterweatherman v1.1.0 // indirect
+	github.com/spf13/pflag v1.0.5
+	github.com/spf13/viper v1.7.1
 	github.com/stretchr/testify v1.4.0
-	github.com/urfave/negroni v1.0.0 // indirect
+	golang.org/x/sys v0.0.0-20201223074533-0d417f636930 // indirect
+	golang.org/x/text v0.3.4 // indirect
+	gopkg.in/ini.v1 v1.62.0 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
 )