From 8568a504ef290e4148ccbbaeabb266fc515aa44a Mon Sep 17 00:00:00 2001
From: Marcello Teodori <151025+mteodori@users.noreply.github.com>
Date: Thu, 14 Jan 2021 01:15:02 +0100
Subject: [PATCH] ACS-1110 replace fabric8 with docker-maven-plugin (#1205)

---
 docker-alfresco/pom.xml | 30 +++---------------------------
 scripts/travis/init.sh  |  4 ----
 2 files changed, 3 insertions(+), 31 deletions(-)

diff --git a/docker-alfresco/pom.xml b/docker-alfresco/pom.xml
index e7f50e8e2..a85a3088b 100644
--- a/docker-alfresco/pom.xml
+++ b/docker-alfresco/pom.xml
@@ -84,17 +84,11 @@
                 <plugins>
                     <plugin>
                         <groupId>io.fabric8</groupId>
-                        <artifactId>fabric8-maven-plugin</artifactId>
+                        <artifactId>docker-maven-plugin</artifactId>
                         <configuration>
                             <images>
                                 <image>
                                     <name>${image.name}:${image.tag}</name>
-                                    <build>
-                                        <dockerFileDir>${project.basedir}/</dockerFileDir>
-                                        <buildOptions>
-                                            <squash>true</squash>
-                                        </buildOptions>
-                                    </build>
                                 </image>
                             </images>
                         </configuration>
@@ -119,19 +113,13 @@
                 <plugins>
                     <plugin>
                         <groupId>io.fabric8</groupId>
-                        <artifactId>fabric8-maven-plugin</artifactId>
+                        <artifactId>docker-maven-plugin</artifactId>
                         <configuration>
                             <images>
                                 <!-- Quay image -->
                                 <image>
                                     <name>${image.name}:${image.tag}</name>
                                     <registry>${image.registry}</registry>
-                                    <build>
-                                        <dockerFileDir>${project.basedir}/</dockerFileDir>
-                                        <buildOptions>
-                                            <squash>true</squash>
-                                        </buildOptions>
-                                    </build>
                                 </image>
                             </images>
                         </configuration>
@@ -157,29 +145,17 @@
                 <plugins>
                     <plugin>
                         <groupId>io.fabric8</groupId>
-                        <artifactId>fabric8-maven-plugin</artifactId>
+                        <artifactId>docker-maven-plugin</artifactId>
                         <configuration combine.self="override">
                             <images>
                                 <!-- Quay image -->
                                 <image>
                                     <name>${image.name}:${project.version}</name>
                                     <registry>${image.registry}</registry>
-                                    <build>
-                                        <dockerFileDir>${project.basedir}/</dockerFileDir>
-                                        <buildOptions>
-                                            <squash>true</squash>
-                                        </buildOptions>
-                                    </build>
                                 </image>
                                 <!-- DockerHub image -->
                                 <image>
                                     <name>${image.name}:${project.version}</name>
-                                    <build>
-                                        <dockerFileDir>${project.basedir}/</dockerFileDir>
-                                        <buildOptions>
-                                            <squash>true</squash>
-                                        </buildOptions>
-                                    </build>
                                 </image>
                             </images>
                         </configuration>
diff --git a/scripts/travis/init.sh b/scripts/travis/init.sh
index b3da42202..2eb4e3f15 100644
--- a/scripts/travis/init.sh
+++ b/scripts/travis/init.sh
@@ -14,10 +14,6 @@ if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then
   echo "${QUAY_PASSWORD}" | docker login -u="${QUAY_USERNAME}" --password-stdin quay.io
 fi
 
-# Enable experimental docker features (for the image squash option)
-echo '{"experimental":true}' | sudo tee /etc/docker/daemon.json
-sudo service docker restart
-
 # not helpful in this script
 # export HOST_IP=$(hostname  -I | cut -f1 -d' ')