Skip to content

Commit 45d3ac3

Browse files
Add arm arch and bump to GO 1.16
Signed-off-by: Pierre-Emmanuel Jacquier <15922119+pierre-emmanuelJ@users.noreply.github.com>
1 parent c9f2c63 commit 45d3ac3

7 files changed

Lines changed: 41 additions & 17 deletions

File tree

.Dockerfile.goreleaser

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM alpine:3.12.0
1+
FROM alpine:3
22
RUN apk add ca-certificates
33
COPY iptv-proxy /
44
ENTRYPOINT ["/iptv-proxy"]

.github/workflows/cd.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
name: Set up Go
2626
uses: actions/setup-go@v2
2727
with:
28-
go-version: 1.14
28+
go-version: 1.16
2929
-
3030
name: Run GoReleaser
3131
uses: goreleaser/goreleaser-action@v2

.goreleaser.yaml

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ builds:
1111
- windows
1212
- darwin
1313
- linux
14-
- openbsd
1514

1615
goarch:
1716
- amd64
17+
- arm64
1818

1919
archives:
2020
-
@@ -40,21 +40,36 @@ nfpms:
4040
- rpm
4141

4242
dockers:
43-
-
43+
- image_templates:
44+
- "docker.pkg.github.com/pierre-emmanuelj/iptv-proxy/iptv-proxy:{{ .Tag }}-amd64"
45+
- "pierro777/iptv-proxy:{{ .Tag }}-amd64"
46+
use_buildx: true
4447
goos: linux
4548
goarch: amd64
46-
binaries:
49+
ids:
4750
- iptv-proxy
48-
image_templates:
49-
- "docker.pkg.github.com/pierre-emmanuelj/iptv-proxy/iptv-proxy:{{ .Tag }}"
50-
- "pierro777/iptv-proxy:{{ .Tag }}"
51-
51+
build_flag_templates:
52+
- "--platform=linux/amd64"
53+
- "--label=org.opencontainers.image.created={{.Date}}"
54+
- "--label=org.opencontainers.image.name={{.ProjectName}}"
55+
- "--label=org.opencontainers.image.revision={{.FullCommit}}"
56+
- "--label=org.opencontainers.image.version={{.Version}}"
5257
skip_push: false
58+
dockerfile: .Dockerfile.goreleaser
5359

60+
- image_templates:
61+
- "docker.pkg.github.com/pierre-emmanuelj/iptv-proxy/iptv-proxy:{{ .Tag }}-arm64"
62+
- "pierro777/iptv-proxy:{{ .Tag }}-arm64"
63+
use_buildx: true
64+
goos: linux
65+
goarch: arm64
66+
ids:
67+
- iptv-proxy
5468
build_flag_templates:
69+
- "--platform=linux/arm64/v8"
5570
- "--label=org.opencontainers.image.created={{.Date}}"
5671
- "--label=org.opencontainers.image.name={{.ProjectName}}"
5772
- "--label=org.opencontainers.image.revision={{.FullCommit}}"
5873
- "--label=org.opencontainers.image.version={{.Version}}"
59-
74+
skip_push: false
6075
dockerfile: .Dockerfile.goreleaser

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
FROM golang:1.14.4-alpine
1+
FROM golang:1.16-alpine
22

33
RUN apk add ca-certificates
44

55
WORKDIR /go/src/github.com/pierre-emmanuelJ/iptv-proxy
66
COPY . .
77
RUN GO111MODULE=off CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o iptv-proxy .
88

9-
FROM alpine:3.11.6
9+
FROM alpine:3
1010
COPY --from=0 /go/src/github.com/pierre-emmanuelJ/iptv-proxy/iptv-proxy /
1111
ENTRYPOINT ["/iptv-proxy"]

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ require (
1414
github.com/tellytv/go.xtream-codes v0.0.0-20190427212115-45e8162ba888
1515
)
1616

17-
go 1.13
17+
go 1.16

go.sum

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM
1818
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
1919
github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
2020
github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
21-
github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
2221
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
2322
github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
2423
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
3837
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
3938
github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI=
4039
github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
41-
github.com/onsi/ginkgo v1.6.0 h1:Ix8l273rp3QzYgXSR+c8d1fTG7UPgYkOSELPhiY/YGw=
4240
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
4341
github.com/onsi/gomega v1.7.1 h1:K0jcRCwNQM3vFGh1ppMtDh/+7ApJrjldlX8fA0jDTLQ=
4442
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=
8381
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
8482
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
8583
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
86-
gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
8784
gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
8885
gopkg.in/go-playground/assert.v1 v1.2.1 h1:xoYuJVE7KT85PYWrN730RguIQO0ePzVRfFMXadIrXTM=
8986
gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE=
9087
gopkg.in/go-playground/validator.v8 v8.18.2 h1:lFB4DoMU6B626w8ny76MV7VX6W2VHct2GVOI3xgiMrQ=
9188
gopkg.in/go-playground/validator.v8 v8.18.2/go.mod h1:RX2a/7Ha8BgOhfk7j780h4/u/RRjR0eouCJSH80/M2Y=
92-
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
9389
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
9490
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
9591
gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=

vendor/modules.txt

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
1+
# github.com/BurntSushi/toml v0.3.1
2+
## explicit
13
# github.com/fsnotify/fsnotify v1.4.7
24
github.com/fsnotify/fsnotify
35
# github.com/gin-contrib/cors v0.0.0-20190226021855-50921afdc5c1
6+
## explicit
47
github.com/gin-contrib/cors
58
# github.com/gin-contrib/sse v0.0.0-20170109093832-22d885f9ecc7
69
github.com/gin-contrib/sse
710
# github.com/gin-gonic/gin v1.3.0
11+
## explicit
812
github.com/gin-gonic/gin
913
github.com/gin-gonic/gin/binding
1014
github.com/gin-gonic/gin/json
@@ -23,8 +27,10 @@ github.com/hashicorp/hcl/json/parser
2327
github.com/hashicorp/hcl/json/scanner
2428
github.com/hashicorp/hcl/json/token
2529
# github.com/inconshreveable/mousetrap v1.0.0
30+
## explicit
2631
github.com/inconshreveable/mousetrap
2732
# github.com/jamesnetherton/m3u v0.1.1-0.20180924175816-16741c7f081c
33+
## explicit
2834
github.com/jamesnetherton/m3u
2935
# github.com/json-iterator/go v1.1.5
3036
github.com/json-iterator/go
@@ -33,31 +39,38 @@ github.com/magiconair/properties
3339
# github.com/mattn/go-isatty v0.0.4
3440
github.com/mattn/go-isatty
3541
# github.com/mitchellh/go-homedir v1.1.0
42+
## explicit
3643
github.com/mitchellh/go-homedir
3744
# github.com/mitchellh/mapstructure v1.1.2
3845
github.com/mitchellh/mapstructure
3946
# github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd
4047
github.com/modern-go/concurrent
4148
# github.com/modern-go/reflect2 v1.0.1
4249
github.com/modern-go/reflect2
50+
# github.com/onsi/gomega v1.7.1
51+
## explicit
4352
# github.com/pelletier/go-toml v1.2.0
4453
github.com/pelletier/go-toml
4554
# github.com/satori/go.uuid v1.2.0
55+
## explicit
4656
github.com/satori/go.uuid
4757
# github.com/spf13/afero v1.1.2
4858
github.com/spf13/afero
4959
github.com/spf13/afero/mem
5060
# github.com/spf13/cast v1.3.0
5161
github.com/spf13/cast
5262
# github.com/spf13/cobra v0.0.3
63+
## explicit
5364
github.com/spf13/cobra
5465
# github.com/spf13/jwalterweatherman v1.0.0
5566
github.com/spf13/jwalterweatherman
5667
# github.com/spf13/pflag v1.0.3
5768
github.com/spf13/pflag
5869
# github.com/spf13/viper v1.3.1
70+
## explicit
5971
github.com/spf13/viper
6072
# github.com/tellytv/go.xtream-codes v0.0.0-20190427212115-45e8162ba888
73+
## explicit
6174
github.com/tellytv/go.xtream-codes
6275
# github.com/ugorji/go/codec v0.0.0-20181209151446-772ced7fd4c2
6376
github.com/ugorji/go/codec

0 commit comments

Comments
 (0)