From 9f8d1af2cd733febd91f444b051c8ba61351c159 Mon Sep 17 00:00:00 2001
From: steve-chavez <stevechavezast@gmail.com>
Date: Fri, 6 Nov 2020 11:56:30 -0500
Subject: [PATCH] nix: add postgrest-docker-login wrapper func

---
 .circleci/config.yml    |  2 +-
 nix/release/default.nix | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index c6cd39815..cff0886fc 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -142,7 +142,7 @@ jobs:
           name: Publish Docker images
           command: |
             export DOCKER_REPO=postgrest
-            docker login -u $DOCKER_USER -p $DOCKER_PASS
+            postgrest-docker-login
             postgrest-release-dockerhub
             postgrest-release-dockerhubdescription
 
diff --git a/nix/release/default.nix b/nix/release/default.nix
index 57f2d6ef3..92d4fae23 100644
--- a/nix/release/default.nix
+++ b/nix/release/default.nix
@@ -41,6 +41,15 @@ let
           --replace v${version} \
           ${releaseFiles}
       '';
+  # Wrapper for login with docker. $DOCKER_USER/$DOCKER_PASS vars come from CircleCI.
+  # The DOCKER_USER is not the same as DOCKER_REPO because we use the https://hub.docker.com/u/postgrestbot account for uploading to dockerhub.
+  dockerLogin =
+    writeShellScriptBin "postgrest-docker-login"
+      ''
+        set -euo pipefail
+
+        docker login -u $DOCKER_USER -p $DOCKER_PASS
+      '';
 
   # Script for publishing a new release on Docker Hub.
   dockerHub =
@@ -97,5 +106,5 @@ let
 in
 buildEnv {
   name = "postgrest-release";
-  paths = [ github dockerHub dockerHubDescription ];
+  paths = [ github dockerLogin dockerHub dockerHubDescription ];
 }