Merge dev into master; it's really about time.

.circleci/config.yml

@@ -4,12 +4,9 @@ jobs:
     docker:
       - image: circleci/golang:1
 
-    working_directory: /go/src/github.com/tellytv/telly
     steps:
       - checkout
-      - run: curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
-      - run: go get -u github.com/alecthomas/gometalinter
-      - run: gometalinter --install
-      - run: dep ensure -vendor-only
+      # - run: go get -u github.com/alecthomas/gometalinter
+      # - run: gometalinter --install
       - run: go test -v ./...
-      - run: gometalinter --config=.gometalinter.json ./...
+      # - run: gometalinter --config=.gometalinter.json ./...

.gitignore

@@ -4,9 +4,13 @@ telly
 .DS_Store
 /.GOPATH
 /bin
-*.xml
+/*.xml
 vendor/
 /.build
 /.release
 /.tarballs
 *.tar.gz
+telly.config.*
+.idea/*
+telly.db
+a_main-packr.go

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "frontend"]
+	path = frontend
+	url = https://github.com/tellytv/frontend.git

.promu.yml

@@ -1,14 +1,25 @@
 repository:
-    path: github.com/tellytv/telly
+  path: github.com/tellytv/telly
 build:
-    flags: -a -tags netgo
-    ldflags: |
-        -X {{repoPath}}/vendor/github.com/prometheus/common/version.Version={{.Version}}
-        -X {{repoPath}}/vendor/github.com/prometheus/common/version.Revision={{.Revision}}
-        -X {{repoPath}}/vendor/github.com/prometheus/common/version.Branch={{.Branch}}
-        -X {{repoPath}}/vendor/github.com/prometheus/common/version.BuildUser={{user}}@{{host}}
-        -X {{repoPath}}/vendor/github.com/prometheus/common/version.BuildDate={{date "20060102-15:04:05"}}
+  flags: -a -tags netgo
+  ldflags: |
+    -X github.com/prometheus/common/version.Version={{.Version}}
+    -X github.com/prometheus/common/version.Revision={{.Revision}}
+    -X github.com/prometheus/common/version.Branch={{.Branch}}
+    -X github.com/prometheus/common/version.BuildUser={{user}}@{{host}}
+    -X github.com/prometheus/common/version.BuildDate={{date "20060102-15:04:05"}}
 tarball:
-    files:
-        - LICENSE
-        - NOTICE
+  files:
+    - LICENSE
+    - NOTICE
+crossbuild:
+  platforms:
+    - linux/386
+    - linux/amd64
+    - linux/arm
+    - linux/arm64
+    - darwin/amd64
+    - windows/amd64
+    - windows/386
+    - freebsd/amd64
+    - freebsd/386

Dockerfile

@@ -1,26 +1,6 @@
-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
-
-# Copy the code from the host and compile it
-WORKDIR $GOPATH/src/github.com/tellytv/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' \
-  && 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 .build/linux-amd64/telly ./app
 EXPOSE 6077
 ENTRYPOINT ["./app"]
+
+

Dockerfile.ffmpeg

@@ -0,0 +1,4 @@
+FROM jrottenberg/ffmpeg:4.0-alpine
+COPY --from=tellytv/telly:dev /app /app
+EXPOSE 6077
+ENTRYPOINT ["/app"]