From 04a84670957626664b5c7b193d4c2118df226bb1 Mon Sep 17 00:00:00 2001
From: Arpit Mohan <arpit@appsmith.com>
Date: Thu, 17 Oct 2019 11:55:55 +0530
Subject: [PATCH] Fixing the docker credentials in maven so that we don't
 require the docker daemon for CI/CD

---
 app/server/.gitlab-ci.yml | 3 +--
 app/server/pom.xml        | 7 +++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/server/.gitlab-ci.yml b/app/server/.gitlab-ci.yml
index 74d81a1b31..051301c60c 100644
--- a/app/server/.gitlab-ci.yml
+++ b/app/server/.gitlab-ci.yml
@@ -17,7 +17,6 @@ variables:
   SPRING_PROFILES_ACTIVE: test
   MAVEN_OPTS: "-Djava.awt.headless=true -Dmaven.repo.local=./.m2/repository"
   MAVEN_CLI_OPTS: "--batch-mode --errors --fail-at-end --show-version"
-  DOCKER_HUB_ACCESS_TOKEN: "8f5085ea-3b04-42bd-8a67-22bca42443c8"
   DOCKER_IMAGE_NAME: $CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME:$CI_COMMIT_SHORT_SHA
   HEROKU_API_KEY: "467e709c-8489-4e26-be07-050030251f3d"
 
@@ -39,9 +38,9 @@ maven-build:
     - merge_requests
 
 docker-package:
+  image: maven:3-jdk-11-slim
   stage: package
   script:
-    - docker login -u arpitappsmith -p $DOCKER_HUB_ACCESS_TOKEN
     - mvn package -DskipTests -DskipDockerBuild=false
   only:
     - master
diff --git a/app/server/pom.xml b/app/server/pom.xml
index 7a1d0950b4..589ef890c2 100644
--- a/app/server/pom.xml
+++ b/app/server/pom.xml
@@ -57,6 +57,13 @@
                             structure of Docker hub. Will move it to Appsmith's org account once that is resolved.
                          -->
                         <image>docker.io/arpitappsmith/appsmith-server</image>
+                        <!-- Please define the Docker Hub credentials as environment variables.
+                            In Gitlab, this will be defined under VARIABLES section of CI/CD Settings
+                        -->
+                        <auth>
+                            <username>${env.DOCKER_HUB_USERNAME}</username>
+                            <password>${env.DOCKER_HUB_ACCESS_TOKEN}</password>
+                        </auth>
                     </to>
                     <container>
                         <jvmFlags>