REPO-5271 Backport new structure to master (#22)

- Simplify dependencies and standardise order
- README updated
- Green builds
- Changes to make Jars in enterprise war match
- Changes to make files in enterprise image match
- Added travis_wait 40 to the initial build as it can take 20 minutes to download artifacts

packaging/docker-alfresco/Dockerfile

@@ -2,7 +2,7 @@
 # More infos about this image: https://github.com/Alfresco/alfresco-docker-base-tomcat
 FROM alfresco/alfresco-base-tomcat:8.5.51-java-11-openjdk-centos-7
 
-# Set default docker_context. Will / Can be overriden with maven.
+# Set default docker_context.
 ARG resource_path=target
 
 # Set default user information
@@ -48,7 +48,8 @@ COPY ${resource_path}/amps ${TOMCAT_DIR}/amps
 
 # Install amps on alfresco.war
 RUN java -jar ${TOMCAT_DIR}/alfresco-mmt/alfresco-mmt*.jar install \
-              ${TOMCAT_DIR}/amps ${TOMCAT_DIR}/webapps/alfresco -directory -nobackup -force
+              ${TOMCAT_DIR}/amps \
+              ${TOMCAT_DIR}/webapps/alfresco -directory -nobackup
 
 # Move the log file
 RUN sed -i -e "s_log4j.appender.File.File\=alfresco.log_log4j.appender.File.File\=${TOMCAT_DIR}/logs\/alfresco.log_" \
@@ -69,14 +70,13 @@ RUN yum install -y fontconfig-2.13.0-4.3.el7 \
                    dejavu-sans-fonts-2.33-6.el7 && \
     yum clean all
 
-# Generate default keystore. Please generate new one for production systems
+# Generate default keystore. Please generate a new one for production systems
 ARG CERT_DNAME="CN=Alfresco Repository, OU=Unknown, O=Alfresco Software Ltd., L=Maidenhead, ST=UK, C=GB"
 ARG CERT_VALIDITY=36525
 ARG KEYSTORE_PASSWORD=mp6yc0UD9e
 RUN mkdir ${TOMCAT_DIR}/shared/classes/alfresco/keystore && \
     keytool -genseckey -dname "$CERT_DNAME" -validity ${CERT_VALIDITY} -alias metadata -keyalg AES -keysize 256 -keystore ${TOMCAT_DIR}/shared/classes/alfresco/keystore/keystore -storetype pkcs12 -storepass ${KEYSTORE_PASSWORD}
 
-
 # The standard configuration is to have all Tomcat files owned by root with group GROUPNAME and whilst owner has read/write privileges, 
 # group only has restricted permissions and world has no permissions.
 RUN mkdir -p ${TOMCAT_DIR}/conf/Catalina/localhost && \
@@ -95,7 +95,10 @@ RUN mkdir -p ${TOMCAT_DIR}/conf/Catalina/localhost && \
     chmod o-w ${TOMCAT_DIR}/logs && \
     chmod g+rwx ${TOMCAT_DIR}/temp && \
     chmod g+rwx ${TOMCAT_DIR}/work && \
-    chmod o-w ${TOMCAT_DIR}/work
+    chmod o-w ${TOMCAT_DIR}/work && \
+    chmod 664 ${TOMCAT_DIR}/alfresco-mmt/alfresco-mmt-*.jar && \
+    find /licenses -type d -exec chmod 0755 {} \; && \
+    find /licenses -type f -exec chmod 0644 {} \;
 
 EXPOSE 10001