inteligr8/alfresco-transform-core
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-transform-core.git synced 2025-08-07 17:48:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

ATS-400 : Squash layers during docker image build (#28)

Browse Source 
* ATS-400 : Squash layers during docker image build

* ATS-400 : Upgrade fabric8-maven-plugin to 4.1.0

* ATS-400 : Update build environment OS to Ubuntu 16 Xenial

* ATS-400 : Enable docker experimental features
This commit is contained in:
CezarLeahu
2019-05-21 11:43:17 +03:00
committed by GitHub
parent 97a388d00c
commit 7ecbcdb373
8 changed files with 68 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@@ -1,7 +1,7 @@
--- ---
language: java language: java
jdk: openjdk11 jdk: openjdk11
dist: trusty dist: xenial
git: git:
depth: false depth: false

4
_ci/init.sh
View File

@@ -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 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 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 popd
set +vex set +vex
echo "=========================== Finishing Init Script ==========================" echo "=========================== Finishing Init Script =========================="

15
alfresco-docker-alfresco-pdf-renderer/pom.xml
View File

@@ -72,6 +72,9 @@
<name>${image.name}:${image.tag}</name> <name>${image.name}:${image.tag}</name>
<build> <build>
<dockerFileDir>${project.basedir}/</dockerFileDir> <dockerFileDir>${project.basedir}/</dockerFileDir>
<buildOptions>
<squash>true</squash>
</buildOptions>
</build> </build>
</image> </image>
</images> </images>
@@ -118,6 +121,9 @@
<registry>${image.registry}</registry> <registry>${image.registry}</registry>
<build> <build>
<dockerFileDir>${project.basedir}/</dockerFileDir> <dockerFileDir>${project.basedir}/</dockerFileDir>
<buildOptions>
<squash>true</squash>
</buildOptions>
</build> </build>
</image> </image>
<!-- DockerHub image --> <!-- DockerHub image -->
@@ -125,6 +131,9 @@
<name>${image.name}:${image.tag}</name> <name>${image.name}:${image.tag}</name>
<build> <build>
<dockerFileDir>${project.basedir}/</dockerFileDir> <dockerFileDir>${project.basedir}/</dockerFileDir>
<buildOptions>
<squash>true</squash>
</buildOptions>
</build> </build>
</image> </image>
</images> </images>
@@ -159,6 +168,9 @@
<registry>${image.registry}</registry> <registry>${image.registry}</registry>
<build> <build>
<dockerFileDir>${project.basedir}/</dockerFileDir> <dockerFileDir>${project.basedir}/</dockerFileDir>
<buildOptions>
<squash>true</squash>
</buildOptions>
</build> </build>
</image> </image>
<!-- DockerHub image --> <!-- DockerHub image -->
@@ -166,6 +178,9 @@
<name>${image.name}:${project.version}</name> <name>${image.name}:${project.version}</name>
<build> <build>
<dockerFileDir>${project.basedir}/</dockerFileDir> <dockerFileDir>${project.basedir}/</dockerFileDir>
<buildOptions>
<squash>true</squash>
</buildOptions>
</build> </build>
</image> </image>
</images> </images>

15
alfresco-docker-imagemagick/pom.xml
View File

@@ -72,6 +72,9 @@
<name>${image.name}:${image.tag}</name> <name>${image.name}:${image.tag}</name>
<build> <build>
<dockerFileDir>${project.basedir}/</dockerFileDir> <dockerFileDir>${project.basedir}/</dockerFileDir>
<buildOptions>
<squash>true</squash>
</buildOptions>
</build> </build>
</image> </image>
</images> </images>
@@ -118,6 +121,9 @@
<registry>${image.registry}</registry> <registry>${image.registry}</registry>
<build> <build>
<dockerFileDir>${project.basedir}/</dockerFileDir> <dockerFileDir>${project.basedir}/</dockerFileDir>
<buildOptions>
<squash>true</squash>
</buildOptions>
</build> </build>
</image> </image>
<!-- DockerHub image --> <!-- DockerHub image -->
@@ -125,6 +131,9 @@
<name>${image.name}:${image.tag}</name> <name>${image.name}:${image.tag}</name>
<build> <build>
<dockerFileDir>${project.basedir}/</dockerFileDir> <dockerFileDir>${project.basedir}/</dockerFileDir>
<buildOptions>
<squash>true</squash>
</buildOptions>
</build> </build>
</image> </image>
</images> </images>
@@ -159,6 +168,9 @@
<registry>${image.registry}</registry> <registry>${image.registry}</registry>
<build> <build>
<dockerFileDir>${project.basedir}/</dockerFileDir> <dockerFileDir>${project.basedir}/</dockerFileDir>
<buildOptions>
<squash>true</squash>
</buildOptions>
</build> </build>
</image> </image>
<!-- DockerHub image --> <!-- DockerHub image -->
@@ -166,6 +178,9 @@
<name>${image.name}:${project.version}</name> <name>${image.name}:${project.version}</name>
<build> <build>
<dockerFileDir>${project.basedir}/</dockerFileDir> <dockerFileDir>${project.basedir}/</dockerFileDir>
<buildOptions>
<squash>true</squash>
</buildOptions>
</build> </build>
</image> </image>
</images> </images>

4
alfresco-docker-libreoffice/Dockerfile
View File

@@ -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 && \ RUN ln /alfresco-docker-libreoffice-${env.project_version}.jar /usr/bin/alfresco-docker-libreoffice.jar && \
yum install -y cairo cups-libs libSM && \ yum install -y cairo cups-libs libSM && \
test -f libreoffice-dist-5.4.6-linux.gz && \ 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_RPM_URL -o libreoffice-dist-linux.gz && \
curl -s -S $LIBREOFFICE_LICENSE_FILE -o libreoffice.txt && \ curl -s -S $LIBREOFFICE_LICENSE_FILE -o libreoffice.txt && \
tar xzf libreoffice-dist-linux.gz && \ tar xzf libreoffice-dist-linux.gz && \
yum localinstall -y LibreOffice*/RPMS/*.rpm && \ 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 yum clean all
ADD target/generated-resources/licenses /licenses ADD target/generated-resources/licenses /licenses

15
alfresco-docker-libreoffice/pom.xml
View File

@@ -80,6 +80,9 @@
<name>${image.name}:${image.tag}</name> <name>${image.name}:${image.tag}</name>
<build> <build>
<dockerFileDir>${project.basedir}/</dockerFileDir> <dockerFileDir>${project.basedir}/</dockerFileDir>
<buildOptions>
<squash>true</squash>
</buildOptions>
</build> </build>
</image> </image>
</images> </images>
@@ -126,6 +129,9 @@
<registry>${image.registry}</registry> <registry>${image.registry}</registry>
<build> <build>
<dockerFileDir>${project.basedir}/</dockerFileDir> <dockerFileDir>${project.basedir}/</dockerFileDir>
<buildOptions>
<squash>true</squash>
</buildOptions>
</build> </build>
</image> </image>
<!-- DockerHub image --> <!-- DockerHub image -->
@@ -133,6 +139,9 @@
<name>${image.name}:${image.tag}</name> <name>${image.name}:${image.tag}</name>
<build> <build>
<dockerFileDir>${project.basedir}/</dockerFileDir> <dockerFileDir>${project.basedir}/</dockerFileDir>
<buildOptions>
<squash>true</squash>
</buildOptions>
</build> </build>
</image> </image>
</images> </images>
@@ -167,6 +176,9 @@
<registry>${image.registry}</registry> <registry>${image.registry}</registry>
<build> <build>
<dockerFileDir>${project.basedir}/</dockerFileDir> <dockerFileDir>${project.basedir}/</dockerFileDir>
<buildOptions>
<squash>true</squash>
</buildOptions>
</build> </build>
</image> </image>
<!-- DockerHub image --> <!-- DockerHub image -->
@@ -174,6 +186,9 @@
<name>${image.name}:${project.version}</name> <name>${image.name}:${project.version}</name>
<build> <build>
<dockerFileDir>${project.basedir}/</dockerFileDir> <dockerFileDir>${project.basedir}/</dockerFileDir>
<buildOptions>
<squash>true</squash>
</buildOptions>
</build> </build>
</image> </image>
</images> </images>

15
alfresco-docker-tika/pom.xml
View File

@@ -144,6 +144,9 @@
<name>${image.name}:${image.tag}</name> <name>${image.name}:${image.tag}</name>
<build> <build>
<dockerFileDir>${project.basedir}/</dockerFileDir> <dockerFileDir>${project.basedir}/</dockerFileDir>
<buildOptions>
<squash>true</squash>
</buildOptions>
</build> </build>
</image> </image>
</images> </images>
@@ -190,6 +193,9 @@
<registry>${image.registry}</registry> <registry>${image.registry}</registry>
<build> <build>
<dockerFileDir>${project.basedir}/</dockerFileDir> <dockerFileDir>${project.basedir}/</dockerFileDir>
<buildOptions>
<squash>true</squash>
</buildOptions>
</build> </build>
</image> </image>
<!-- DockerHub image --> <!-- DockerHub image -->
@@ -197,6 +203,9 @@
<name>${image.name}:${image.tag}</name> <name>${image.name}:${image.tag}</name>
<build> <build>
<dockerFileDir>${project.basedir}/</dockerFileDir> <dockerFileDir>${project.basedir}/</dockerFileDir>
<buildOptions>
<squash>true</squash>
</buildOptions>
</build> </build>
</image> </image>
</images> </images>
@@ -231,6 +240,9 @@
<registry>${image.registry}</registry> <registry>${image.registry}</registry>
<build> <build>
<dockerFileDir>${project.basedir}/</dockerFileDir> <dockerFileDir>${project.basedir}/</dockerFileDir>
<buildOptions>
<squash>true</squash>
</buildOptions>
</build> </build>
</image> </image>
<!-- DockerHub image --> <!-- DockerHub image -->
@@ -238,6 +250,9 @@
<name>${image.name}:${project.version}</name> <name>${image.name}:${project.version}</name>
<build> <build>
<dockerFileDir>${project.basedir}/</dockerFileDir> <dockerFileDir>${project.basedir}/</dockerFileDir>
<buildOptions>
<squash>true</squash>
</buildOptions>
</build> </build>
</image> </image>
</images> </images>

2
pom.xml
View File

@@ -207,7 +207,7 @@
<plugin> <plugin>
<groupId>io.fabric8</groupId> <groupId>io.fabric8</groupId>
<artifactId>fabric8-maven-plugin</artifactId> <artifactId>fabric8-maven-plugin</artifactId>
<version>3.5.42</version> <version>4.1.0</version>
</plugin> </plugin>
</plugins> </plugins>
</pluginManagement> </pluginManagement>