diff --git a/.Dockerfile.goreleaser b/.Dockerfile.goreleaser index e82214eb..70e63555 100644 --- a/.Dockerfile.goreleaser +++ b/.Dockerfile.goreleaser @@ -1,4 +1,4 @@ -FROM alpine:3.12.0 +FROM alpine:3 RUN apk add ca-certificates COPY iptv-proxy / ENTRYPOINT ["/iptv-proxy"] diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index d912bf18..2b536951 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -15,6 +15,10 @@ jobs: - name: Unshallow run: git fetch --prune --unshallow + - + name: Set up Docker Buildx + id: buildx + uses: docker/setup-buildx-action@v1 - name: Github Docker login run: echo ${{ secrets.GH_TOKEN }} | docker login docker.pkg.github.com -u ${{ github.actor }} --password-stdin @@ -25,7 +29,7 @@ jobs: name: Set up Go uses: actions/setup-go@v2 with: - go-version: 1.14 + go-version: 1.16 - name: Run GoReleaser uses: goreleaser/goreleaser-action@v2 diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 8bb487fb..301402f6 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -11,10 +11,10 @@ builds: - windows - darwin - linux - - openbsd goarch: - amd64 + - arm64 archives: - @@ -40,21 +40,36 @@ nfpms: - rpm dockers: - - + - image_templates: + - "docker.pkg.github.com/pierre-emmanuelj/iptv-proxy/iptv-proxy:{{ .Tag }}-amd64" + - "pierro777/iptv-proxy:{{ .Tag }}-amd64" + use_buildx: true goos: linux goarch: amd64 - binaries: + ids: - iptv-proxy - image_templates: - - "docker.pkg.github.com/pierre-emmanuelj/iptv-proxy/iptv-proxy:{{ .Tag }}" - - "pierro777/iptv-proxy:{{ .Tag }}" - + build_flag_templates: + - "--platform=linux/amd64" + - "--label=org.opencontainers.image.created={{.Date}}" + - "--label=org.opencontainers.image.name={{.ProjectName}}" + - "--label=org.opencontainers.image.revision={{.FullCommit}}" + - "--label=org.opencontainers.image.version={{.Version}}" skip_push: false + dockerfile: .Dockerfile.goreleaser + - image_templates: + - "docker.pkg.github.com/pierre-emmanuelj/iptv-proxy/iptv-proxy:{{ .Tag }}-arm64" + - "pierro777/iptv-proxy:{{ .Tag }}-arm64" + use_buildx: true + goos: linux + goarch: arm64 + ids: + - iptv-proxy build_flag_templates: + - "--platform=linux/arm64/v8" - "--label=org.opencontainers.image.created={{.Date}}" - "--label=org.opencontainers.image.name={{.ProjectName}}" - "--label=org.opencontainers.image.revision={{.FullCommit}}" - "--label=org.opencontainers.image.version={{.Version}}" - + skip_push: false dockerfile: .Dockerfile.goreleaser diff --git a/Dockerfile b/Dockerfile index bb64d100..cfa7a011 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.14.4-alpine +FROM golang:1.16-alpine RUN apk add ca-certificates @@ -6,6 +6,6 @@ WORKDIR /go/src/github.com/pierre-emmanuelJ/iptv-proxy COPY . . RUN GO111MODULE=off CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o iptv-proxy . -FROM alpine:3.11.6 +FROM alpine:3 COPY --from=0 /go/src/github.com/pierre-emmanuelJ/iptv-proxy/iptv-proxy / ENTRYPOINT ["/iptv-proxy"] diff --git a/go.mod b/go.mod index 107ff20c..66367d57 100644 --- a/go.mod +++ b/go.mod @@ -14,4 +14,4 @@ require ( github.com/tellytv/go.xtream-codes v0.0.0-20190427212115-45e8162ba888 ) -go 1.13 +go 1.16 diff --git a/go.sum b/go.sum index 16804dd9..d74fd983 100644 --- a/go.sum +++ b/go.sum @@ -18,7 +18,6 @@ github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= -github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= @@ -38,7 +37,6 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/onsi/ginkgo v1.6.0 h1:Ix8l273rp3QzYgXSR+c8d1fTG7UPgYkOSELPhiY/YGw= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/gomega v1.7.1 h1:K0jcRCwNQM3vFGh1ppMtDh/+7ApJrjldlX8fA0jDTLQ= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= @@ -83,13 +81,11 @@ golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/go-playground/assert.v1 v1.2.1 h1:xoYuJVE7KT85PYWrN730RguIQO0ePzVRfFMXadIrXTM= gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE= gopkg.in/go-playground/validator.v8 v8.18.2 h1:lFB4DoMU6B626w8ny76MV7VX6W2VHct2GVOI3xgiMrQ= gopkg.in/go-playground/validator.v8 v8.18.2/go.mod h1:RX2a/7Ha8BgOhfk7j780h4/u/RRjR0eouCJSH80/M2Y= -gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I= diff --git a/vendor/modules.txt b/vendor/modules.txt index 92f13b3f..3b0af1ee 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1,10 +1,14 @@ +# github.com/BurntSushi/toml v0.3.1 +## explicit # github.com/fsnotify/fsnotify v1.4.7 github.com/fsnotify/fsnotify # github.com/gin-contrib/cors v0.0.0-20190226021855-50921afdc5c1 +## explicit github.com/gin-contrib/cors # github.com/gin-contrib/sse v0.0.0-20170109093832-22d885f9ecc7 github.com/gin-contrib/sse # github.com/gin-gonic/gin v1.3.0 +## explicit github.com/gin-gonic/gin github.com/gin-gonic/gin/binding github.com/gin-gonic/gin/json @@ -23,8 +27,10 @@ github.com/hashicorp/hcl/json/parser github.com/hashicorp/hcl/json/scanner github.com/hashicorp/hcl/json/token # github.com/inconshreveable/mousetrap v1.0.0 +## explicit github.com/inconshreveable/mousetrap # github.com/jamesnetherton/m3u v0.1.1-0.20180924175816-16741c7f081c +## explicit github.com/jamesnetherton/m3u # github.com/json-iterator/go v1.1.5 github.com/json-iterator/go @@ -33,6 +39,7 @@ github.com/magiconair/properties # github.com/mattn/go-isatty v0.0.4 github.com/mattn/go-isatty # github.com/mitchellh/go-homedir v1.1.0 +## explicit github.com/mitchellh/go-homedir # github.com/mitchellh/mapstructure v1.1.2 github.com/mitchellh/mapstructure @@ -40,9 +47,12 @@ github.com/mitchellh/mapstructure github.com/modern-go/concurrent # github.com/modern-go/reflect2 v1.0.1 github.com/modern-go/reflect2 +# github.com/onsi/gomega v1.7.1 +## explicit # github.com/pelletier/go-toml v1.2.0 github.com/pelletier/go-toml # github.com/satori/go.uuid v1.2.0 +## explicit github.com/satori/go.uuid # github.com/spf13/afero v1.1.2 github.com/spf13/afero @@ -50,14 +60,17 @@ github.com/spf13/afero/mem # github.com/spf13/cast v1.3.0 github.com/spf13/cast # github.com/spf13/cobra v0.0.3 +## explicit github.com/spf13/cobra # github.com/spf13/jwalterweatherman v1.0.0 github.com/spf13/jwalterweatherman # github.com/spf13/pflag v1.0.3 github.com/spf13/pflag # github.com/spf13/viper v1.3.1 +## explicit github.com/spf13/viper # github.com/tellytv/go.xtream-codes v0.0.0-20190427212115-45e8162ba888 +## explicit github.com/tellytv/go.xtream-codes # github.com/ugorji/go/codec v0.0.0-20181209151446-772ced7fd4c2 github.com/ugorji/go/codec