ATS-484 : Minor improvements

This commit is contained in:
Cezar.Leahu 2019-08-19 18:53:41 +03:00
parent 2cdde6928c
commit 0d6ec24a95
3 changed files with 10 additions and 6 deletions

View File

@ -16,7 +16,7 @@ Contains the common transformer (T-Engine) code, plus a few actual implementatio
The project can be built by running the Maven command: The project can be built by running the Maven command:
```bash ```bash
mvn clean install -DskipTests -Plocal mvn clean install -Plocal,docker-it-setup
``` ```
> The `local` Maven profile builds local Docker images for each T-Engine. > The `local` Maven profile builds local Docker images for each T-Engine.

View File

@ -4,8 +4,10 @@
FROM alfresco/alfresco-base-java:11.0.1-openjdk-centos-7-6784d76a7b81 FROM alfresco/alfresco-base-java:11.0.1-openjdk-centos-7-6784d76a7b81
ENV IMAGEMAGICK_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/thirdparty/content/org/imagemagick/imagemagick-distribution/7.0.7-27/imagemagick-distribution-7.0.7-27-linux.rpm ARG IMAGEMAGICK_VERSION=7.0.7-27
ENV IMAGEMAGICK_LIB_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/thirdparty/content/org/imagemagick/imagemagick-distribution/7.0.7-27/imagemagick-distribution-7.0.7-27-libs-linux.rpm
ENV IMAGEMAGICK_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/thirdparty/content/org/imagemagick/imagemagick-distribution/${IMAGEMAGICK_VERSION}/imagemagick-distribution-${IMAGEMAGICK_VERSION}-linux.rpm
ENV IMAGEMAGICK_LIB_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/thirdparty/content/org/imagemagick/imagemagick-distribution/${IMAGEMAGICK_VERSION}/imagemagick-distribution-${IMAGEMAGICK_VERSION}-libs-linux.rpm
ENV IMAGEMAGICK_LICENSE_FILE=https://github.com/Alfresco/acs-community-packaging/blob/master/distribution/src/main/resources/licenses/3rd-party/ImageMagick-license.txt ENV IMAGEMAGICK_LICENSE_FILE=https://github.com/Alfresco/acs-community-packaging/blob/master/distribution/src/main/resources/licenses/3rd-party/ImageMagick-license.txt
ENV JAVA_OPTS="" ENV JAVA_OPTS=""

View File

@ -4,7 +4,9 @@
FROM alfresco/alfresco-base-java:11.0.1-openjdk-centos-7-6784d76a7b81 FROM alfresco/alfresco-base-java:11.0.1-openjdk-centos-7-6784d76a7b81
ENV LIBREOFFICE_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/thirdparty/content/org/libreoffice/libreoffice-dist/6.1.6/libreoffice-dist-6.1.6-linux.gz ARG LIBREOFFICE_VERSION=6.1.6
ENV LIBREOFFICE_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/thirdparty/content/org/libreoffice/libreoffice-dist/${LIBREOFFICE_VERSION}/libreoffice-dist-${LIBREOFFICE_VERSION}-linux.gz
ENV LIBREOFFICE_LICENSE_FILE=https://github.com/Alfresco/acs-community-packaging/blob/master/distribution/src/main/resources/licenses/3rd-party/libreoffice.txt ENV LIBREOFFICE_LICENSE_FILE=https://github.com/Alfresco/acs-community-packaging/blob/master/distribution/src/main/resources/licenses/3rd-party/libreoffice.txt
ENV JAVA_OPTS="" ENV JAVA_OPTS=""
@ -18,8 +20,8 @@ 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-6.1.6-linux.gz && \ test -f libreoffice-dist-${LIBREOFFICE_VERSION}-linux.gz && \
ln -s libreoffice-dist-6.1.6-linux.gz libreoffice-dist-linux.gz || \ ln -s libreoffice-dist-${LIBREOFFICE_VERSION}-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 && \