Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update #258

Open
wants to merge 32 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
5e8276f
Update Dockerfile
zenjabba Aug 22, 2018
538c1d9
Update Dockerfile
zenjabba Aug 22, 2018
59a447e
Update Dockerfile
zenjabba Aug 22, 2018
b8f8214
Update Dockerfile
zenjabba Aug 22, 2018
5ec5fe1
Update Dockerfile
zenjabba Aug 22, 2018
df842c5
Update Dockerfile
zenjabba Aug 22, 2018
dd9ea43
Update Dockerfile
zenjabba Aug 22, 2018
56e16c0
Update Dockerfile
zenjabba Aug 22, 2018
0cacb87
Update Dockerfile
zenjabba Aug 22, 2018
4eb3a7d
Update Dockerfile
zenjabba Aug 22, 2018
ec589dc
Update Dockerfile
zenjabba Aug 22, 2018
1558c3e
Update Dockerfile
zenjabba Aug 22, 2018
02e2f29
Update Dockerfile
zenjabba Aug 22, 2018
505e860
Update Dockerfile
zenjabba Aug 22, 2018
a0a0bef
Update Dockerfile
zenjabba Aug 22, 2018
ebf4b11
Update Dockerfile
zenjabba Aug 22, 2018
7f94ae5
Update Dockerfile
zenjabba Aug 22, 2018
5938373
Update Dockerfile
zenjabba Aug 22, 2018
610d53f
Update Dockerfile
zenjabba Aug 22, 2018
9bbfcf3
Update Dockerfile
zenjabba Aug 22, 2018
a3b1777
Update Dockerfile
zenjabba Aug 22, 2018
ca79ac8
Update main.go
zenjabba Aug 22, 2018
cb7919f
Update structs.go
zenjabba Aug 22, 2018
f59e022
Update config.yml
zenjabba Aug 22, 2018
1bb6142
Update Dockerfile
zenjabba Aug 22, 2018
70721ce
Update Dockerfile
zenjabba Aug 22, 2018
4e00221
Update Dockerfile
zenjabba Aug 22, 2018
f88429c
Update Dockerfile
zenjabba Aug 22, 2018
63bac3f
Update Dockerfile
zenjabba Aug 22, 2018
e73adc7
Update Dockerfile
zenjabba Aug 22, 2018
fdbad66
Update Dockerfile
zenjabba Aug 22, 2018
9dfe81f
Update Dockerfile
zenjabba Aug 22, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ jobs:
docker:
- image: circleci/golang:1.8

working_directory: /go/src/github.com/tellytv/telly
working_directory: /go/src/github.com/zenjabba/telly
steps:
- checkout

Expand Down
30 changes: 20 additions & 10 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,26 +1,36 @@
FROM golang:alpine as builder
FROM ubuntu:16.04
#FROM golang:alpine as builder

# Download and install the latest release of dep
ADD https://github.com/golang/dep/releases/download/v0.5.0/dep-linux-amd64 /usr/bin/dep
RUN chmod +x /usr/bin/dep


# Install git because gin/yaml needs it
RUN apk update && apk upgrade && apk add git
RUN apt -y update && apt -y upgrade
RUN apt -y install git && apt -y install ffmpeg curl coreutils
#RUN add-apt-repository ppa:gophers/archive
#RUN apt-get update
#RUN apt-get -y install golang-1.10-go
RUN mkdir /goroot && curl https://storage.googleapis.com/golang/go1.8.linux-amd64.tar.gz | tar xvzf - -C /goroot --strip-components=1
RUN mkdir /gopath
ENV GOROOT /goroot
ENV GOPATH /gopath
ENV PATH $PATH:$GOROOT/bin:$GOPATH/bin
ADD https://github.com/golang/dep/releases/download/v0.5.0/dep-linux-amd64 /usr/bin/dep
RUN chmod +x /usr/bin/dep

# Copy the code from the host and compile it
WORKDIR $GOPATH/src/github.com/tellytv/telly
WORKDIR $GOPATH/src/github.com/zenjabba/telly
COPY Gopkg.toml Gopkg.lock ./
RUN dep ensure --vendor-only
COPY . ./
RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix nocgo -o /app .

# install ca root certificates + listen on 0.0.0.0 + build
RUN apk add --no-cache ca-certificates \
&& find . -type f -print0 | xargs -0 sed -i 's/"listen", "localhost/"listen", "0.0.0.0/g' \
RUN find . -type f -print0 | xargs -0 sed -i 's/"listen", "localhost/"listen", "0.0.0.0/g' \
&& CGO_ENABLED=0 GOOS=linux go install -ldflags '-w -s -extldflags "-static"'

FROM scratch
COPY --from=builder /app ./
COPY --from=builder /etc/ssl/certs/ /etc/ssl/certs/
#COPY --from=builder /app ./
#COPY --from=builder /etc/ssl/certs/ /etc/ssl/certs/
EXPOSE 6077
ENTRYPOINT ["./app"]
ENTRYPOINT ["/usr/bin/tail", "-f", "/dev/null"]
2 changes: 1 addition & 1 deletion main.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/common/version"
"github.com/sirupsen/logrus"
"github.com/tellytv/telly/m3u"
"github.com/zenjabba/telly/m3u"
kingpin "gopkg.in/alecthomas/kingpin.v2"
)

Expand Down
2 changes: 1 addition & 1 deletion structs.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"regexp"
"strconv"

"github.com/tellytv/telly/m3u"
"github.com/zenjabba/telly/m3u"
)

type config struct {
Expand Down