diff --git a/.travis.yml b/.travis.yml index 382d5770..b8b11264 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ --- language: java jdk: openjdk11 -dist: trusty +dist: xenial git: depth: false diff --git a/_ci/init.sh b/_ci/init.sh index 8cfdfce1..be613bd3 100644 --- a/_ci/init.sh +++ b/_ci/init.sh @@ -10,6 +10,10 @@ echo "${QUAY_PASSWORD}" | docker login -u="alfresco+bamboo" --password-stdin qua echo "${DOCKERHUB_PASSWORD}" | docker login -u=${DOCKERHUB_USERNAME} --password-stdin docker.io find "${HOME}/.m2/repository/" -type d -name "*-SNAPSHOT*" | xargs -r -l rm -rf +# Enable experimental docker features (e.g. squash options) +echo '{"experimental":true}' | sudo tee /etc/docker/daemon.json +sudo service docker restart + popd set +vex echo "=========================== Finishing Init Script ==========================" diff --git a/alfresco-docker-alfresco-pdf-renderer/pom.xml b/alfresco-docker-alfresco-pdf-renderer/pom.xml index 5d9da694..6f08c7da 100644 --- a/alfresco-docker-alfresco-pdf-renderer/pom.xml +++ b/alfresco-docker-alfresco-pdf-renderer/pom.xml @@ -72,6 +72,9 @@ ${image.name}:${image.tag} ${project.basedir}/ + + true + @@ -118,6 +121,9 @@ ${image.registry} ${project.basedir}/ + + true + @@ -125,6 +131,9 @@ ${image.name}:${image.tag} ${project.basedir}/ + + true + @@ -159,6 +168,9 @@ ${image.registry} ${project.basedir}/ + + true + @@ -166,6 +178,9 @@ ${image.name}:${project.version} ${project.basedir}/ + + true + diff --git a/alfresco-docker-imagemagick/pom.xml b/alfresco-docker-imagemagick/pom.xml index a9d0112a..1ddafd5a 100644 --- a/alfresco-docker-imagemagick/pom.xml +++ b/alfresco-docker-imagemagick/pom.xml @@ -72,6 +72,9 @@ ${image.name}:${image.tag} ${project.basedir}/ + + true + @@ -118,6 +121,9 @@ ${image.registry} ${project.basedir}/ + + true + @@ -125,6 +131,9 @@ ${image.name}:${image.tag} ${project.basedir}/ + + true + @@ -159,6 +168,9 @@ ${image.registry} ${project.basedir}/ + + true + @@ -166,6 +178,9 @@ ${image.name}:${project.version} ${project.basedir}/ + + true + diff --git a/alfresco-docker-libreoffice/Dockerfile b/alfresco-docker-libreoffice/Dockerfile index e85a9841..aefaaa57 100644 --- a/alfresco-docker-libreoffice/Dockerfile +++ b/alfresco-docker-libreoffice/Dockerfile @@ -20,12 +20,12 @@ COPY target/alfresco-docker-libreoffice-${env.project_version}.jar libreoffice-d RUN ln /alfresco-docker-libreoffice-${env.project_version}.jar /usr/bin/alfresco-docker-libreoffice.jar && \ yum install -y cairo cups-libs libSM && \ test -f libreoffice-dist-5.4.6-linux.gz && \ - mv libreoffice-dist-5.4.6-linux.gz libreoffice-dist-linux.gz || \ + ln -s libreoffice-dist-5.4.6-linux.gz libreoffice-dist-linux.gz || \ curl -s -S $LIBREOFFICE_RPM_URL -o libreoffice-dist-linux.gz && \ curl -s -S $LIBREOFFICE_LICENSE_FILE -o libreoffice.txt && \ tar xzf libreoffice-dist-linux.gz && \ yum localinstall -y LibreOffice*/RPMS/*.rpm && \ - rm -rf libreoffice-dist-linux.gz LibreOffice_*_Linux_x86-64_rpm && \ + rm -rf libreoffice-dist-*linux.gz LibreOffice_*_Linux_x86-64_rpm && \ yum clean all ADD target/generated-resources/licenses /licenses diff --git a/alfresco-docker-libreoffice/pom.xml b/alfresco-docker-libreoffice/pom.xml index 1f466b20..3ab86444 100644 --- a/alfresco-docker-libreoffice/pom.xml +++ b/alfresco-docker-libreoffice/pom.xml @@ -80,6 +80,9 @@ ${image.name}:${image.tag} ${project.basedir}/ + + true + @@ -126,6 +129,9 @@ ${image.registry} ${project.basedir}/ + + true + @@ -133,6 +139,9 @@ ${image.name}:${image.tag} ${project.basedir}/ + + true + @@ -167,6 +176,9 @@ ${image.registry} ${project.basedir}/ + + true + @@ -174,6 +186,9 @@ ${image.name}:${project.version} ${project.basedir}/ + + true + diff --git a/alfresco-docker-tika/pom.xml b/alfresco-docker-tika/pom.xml index 77b8ba20..45dfe228 100644 --- a/alfresco-docker-tika/pom.xml +++ b/alfresco-docker-tika/pom.xml @@ -144,6 +144,9 @@ ${image.name}:${image.tag} ${project.basedir}/ + + true + @@ -190,6 +193,9 @@ ${image.registry} ${project.basedir}/ + + true + @@ -197,6 +203,9 @@ ${image.name}:${image.tag} ${project.basedir}/ + + true + @@ -231,6 +240,9 @@ ${image.registry} ${project.basedir}/ + + true + @@ -238,6 +250,9 @@ ${image.name}:${project.version} ${project.basedir}/ + + true + diff --git a/pom.xml b/pom.xml index 444d4b05..29d3303f 100644 --- a/pom.xml +++ b/pom.xml @@ -207,7 +207,7 @@ io.fabric8 fabric8-maven-plugin - 3.5.42 + 4.1.0