From 273c5253fd6b6f9b94cd7de14121365d46b1a263 Mon Sep 17 00:00:00 2001
From: Alessio Treglia <quadrispro@ubuntu.com>
Date: Fri, 29 Mar 2019 18:31:55 +0100
Subject: [PATCH] Fix docker_image ci job (#4004)

- Always build regardless of the branch;
  push only from develop and master.
- Add curl to packages dependencies in Dockerfile
  to allow golangci-lint to be downloaded.

Closes: #3977
---
 .circleci/config.yml                       | 20 ++++++++++----------
 .pending/bugfixes/sdk/3977-Fix-docker-imag |  1 +
 Dockerfile                                 |  2 +-
 3 files changed, 12 insertions(+), 11 deletions(-)
 create mode 100644 .pending/bugfixes/sdk/3977-Fix-docker-imag

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3fc90c7bf8a5..2f61bf444852 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -367,14 +367,19 @@ jobs:
       - setup_remote_docker:
           docker_layer_caching: true
       - run: |
-          if [ "${CIRCLE_BRANCH}" == "master" ]; then
+          GAIAD_VERSION=''
+          if [ "${CIRCLE_BRANCH}" = "master" ]; then
             GAIAD_VERSION="stable"
-          elif [ "${CIRCLE_BRANCH}" == "develop" ]; then
+          elif [ "${CIRCLE_BRANCH}" = "develop" ]; then
             GAIAD_VERSION="develop"
           fi
-          docker build -t tendermint/gaia:$GAIAD_VERSION .
-          docker login -u $DOCKER_USER -p $DOCKER_PASS
-          docker push tendermint/gaia:$GAIAD_VERSION
+          if [ -z "${GAIAD_VERSION}" ]; then
+            docker build .
+          else
+            docker build -t tendermint/gaia:$GAIAD_VERSION .
+            docker login -u $DOCKER_USER -p $DOCKER_PASS
+            docker push tendermint/gaia:$GAIAD_VERSION
+          fi
 
   docker_tagged:
     <<: *linux_defaults
@@ -394,11 +399,6 @@ workflows:
   test-suite:
     jobs:
       - docker_image:
-          filters:
-            branches:
-              only:
-                - master
-                - develop
           requires:
             - setup_dependencies
       - docker_tagged:
diff --git a/.pending/bugfixes/sdk/3977-Fix-docker-imag b/.pending/bugfixes/sdk/3977-Fix-docker-imag
new file mode 100644
index 000000000000..82bf994dc460
--- /dev/null
+++ b/.pending/bugfixes/sdk/3977-Fix-docker-imag
@@ -0,0 +1 @@
+#3977 Fix docker image build
diff --git a/Dockerfile b/Dockerfile
index adb79c6bdc0a..517c63589ea9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,7 +5,7 @@
 FROM golang:alpine AS build-env
 
 # Set up dependencies
-ENV PACKAGES make git libc-dev bash gcc linux-headers eudev-dev
+ENV PACKAGES curl make git libc-dev bash gcc linux-headers eudev-dev
 
 # Set working directory for the build
 WORKDIR /go/src/github.com/cosmos/cosmos-sdk