From 27ef4152a8a19ec8462e7efb0c75c46961dbf062 Mon Sep 17 00:00:00 2001
From: "Cezar.Leahu" <cezar.leahu@ness.com>
Date: Wed, 26 Aug 2020 19:06:48 +0300
Subject: [PATCH] ACS-550 Disable release job

- disable release job
- enable DockerHub login in init.sh script
- enable DockerHub image push in the release jobs
---
 .travis.yml                       |  1 +
 packaging/docker-alfresco/pom.xml | 38 +++++++++++++++----------------
 scripts/travis/init.sh            |  3 +--
 3 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index faf4cf9027..683a26b255 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -235,6 +235,7 @@ jobs:
     # TODO enable job
     - name: "Push to Nexus"
       stage: release
+      if: false
       before_script: bash scripts/travis/verify_release_tag.sh
       script: travis_wait 40 bash scripts/travis/maven_release.sh
 
diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml
index 5fc126ea2b..986441232a 100644
--- a/packaging/docker-alfresco/pom.xml
+++ b/packaging/docker-alfresco/pom.xml
@@ -189,16 +189,15 @@
                                     </build>
                                 </image>
                                 <!-- DockerHub image -->
-                                <!-- todo enable when the dockerhub credentials are set on the project -->
-<!--                                <image>-->
-<!--                                    <name>${image.name}:${image.tag}</name>-->
-<!--                                    <build>-->
-<!--                                        <dockerFileDir>${project.basedir}/</dockerFileDir>-->
-<!--                                        <buildOptions>-->
-<!--                                            <squash>true</squash>-->
-<!--                                        </buildOptions>-->
-<!--                                    </build>-->
-<!--                                </image>-->
+                                <image>
+                                    <name>${image.name}:${image.tag}</name>
+                                    <build>
+                                        <dockerFileDir>${project.basedir}/</dockerFileDir>
+                                        <buildOptions>
+                                            <squash>true</squash>
+                                        </buildOptions>
+                                    </build>
+                                </image>
                             </images>
                         </configuration>
                         <executions>
@@ -238,16 +237,15 @@
                                     </build>
                                 </image>
                                 <!-- DockerHub image -->
-                                <!-- todo enable when the dockerhub credentials are set on the project -->
-<!--                                <image>-->
-<!--                                    <name>${image.name}:${project.version}</name>-->
-<!--                                    <build>-->
-<!--                                        <dockerFileDir>${project.basedir}/</dockerFileDir>-->
-<!--                                        <buildOptions>-->
-<!--                                            <squash>true</squash>-->
-<!--                                        </buildOptions>-->
-<!--                                    </build>-->
-<!--                                </image>-->
+                                <image>
+                                    <name>${image.name}:${project.version}</name>
+                                    <build>
+                                        <dockerFileDir>${project.basedir}/</dockerFileDir>
+                                        <buildOptions>
+                                            <squash>true</squash>
+                                        </buildOptions>
+                                    </build>
+                                </image>
                             </images>
                         </configuration>
                         <executions>
diff --git a/scripts/travis/init.sh b/scripts/travis/init.sh
index 0e98f20826..30515f8ac4 100644
--- a/scripts/travis/init.sh
+++ b/scripts/travis/init.sh
@@ -7,8 +7,7 @@ mkdir -p "${HOME}/.m2" && cp -f .travis.settings.xml "${HOME}/.m2/settings.xml"
 find "${HOME}/.m2/repository/" -type d -name "*-SNAPSHOT*" | xargs -r -l rm -rf
 
 # Docker Logins
-# todo enable when the dockerhub credentials are set on the project
-#echo "${DOCKERHUB_USERNAME}" | docker login -u="${DOCKERHUB_PASSWORD}" --password-stdin
+echo "${DOCKERHUB_USERNAME}" | docker login -u="${DOCKERHUB_PASSWORD}" --password-stdin
 echo "${QUAY_PASSWORD}" | docker login -u="${QUAY_USERNAME}" --password-stdin quay.io
 
 # Enable experimental docker features (for the image squash option)