From 49d529d94c802aa5334bbe2fbbaeebb6fed2c525 Mon Sep 17 00:00:00 2001
From: Pierre-Emmanuel Jacquier
 <15922119+pierre-emmanuelJ@users.noreply.github.com>
Date: Fri, 12 Jun 2020 14:39:30 +0200
Subject: [PATCH] Re-publish on Docker Hub

Signed-off-by: Pierre-Emmanuel Jacquier <15922119+pierre-emmanuelJ@users.noreply.github.com>
---
 .Dockerfile.goreleaser   | 3 ++-
 .github/workflows/cd.yml | 5 ++++-
 .goreleaser.yaml         | 2 ++
 Dockerfile               | 4 +++-
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/.Dockerfile.goreleaser b/.Dockerfile.goreleaser
index ccf38e2..e82214e 100644
--- a/.Dockerfile.goreleaser
+++ b/.Dockerfile.goreleaser
@@ -1,3 +1,4 @@
-FROM alpine:3.11.6
+FROM alpine:3.12.0
+RUN apk add ca-certificates
 COPY iptv-proxy /
 ENTRYPOINT ["/iptv-proxy"]
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index 7042253..d912bf1 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -16,8 +16,11 @@ jobs:
         name: Unshallow
         run: git fetch --prune --unshallow
       -
-        name: Docker login
+        name: Github Docker login
         run: echo ${{ secrets.GH_TOKEN }} | docker login docker.pkg.github.com -u ${{ github.actor }} --password-stdin
+      -
+        name: Docker Hub login
+        run: echo ${{ secrets.DOCKER_TOKEN }} | docker login -u ${{ secrets.DOCKER_USER }} --password-stdin
       -
         name: Set up Go
         uses: actions/setup-go@v2
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
index 80d9533..8bb487f 100644
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -6,6 +6,7 @@ builds:
       - CGO_ENABLED=0
     flags:
       - -mod=vendor
+      - -a
     goos:
       - windows
       - darwin
@@ -46,6 +47,7 @@ dockers:
     - iptv-proxy
     image_templates:
     - "docker.pkg.github.com/pierre-emmanuelj/iptv-proxy/iptv-proxy:{{ .Tag }}"
+    - "pierro777/iptv-proxy:{{ .Tag }}"
 
     skip_push: false
 
diff --git a/Dockerfile b/Dockerfile
index 937d752..bb64d10 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,6 @@
-FROM golang:1.13.1-alpine
+FROM golang:1.14.4-alpine
+
+RUN apk add ca-certificates
 
 WORKDIR /go/src/github.com/pierre-emmanuelJ/iptv-proxy
 COPY . .