From aed1be1d01fa5f6280582c6553ed8323bf64feed Mon Sep 17 00:00:00 2001 From: Alexandru-Eusebiu Epure Date: Tue, 13 Mar 2018 19:06:42 +0200 Subject: [PATCH] Add fabric8 plugin to all docker projects and removed the /docker projects that created the images Refactor all poms and moved the sources up a level --- .../.maven-dockerignore | 1 + .../{docker => }/Dockerfile | 6 +- .../{docker => }/LICENSE | 0 .../pom.xml | 66 -------- .../docker/pom.xml | 59 ------- alfresco-docker-alfresco-pdf-renderer/pom.xml | 135 +++++++++++++++- .../AlfrescoPdfRendererController.java | 0 .../org/alfresco/transformer/Application.java | 0 .../resources/templates/transformForm.html | 0 .../.maven-dockerignore | 1 + .../{docker => }/Dockerfile | 10 +- .../{docker => }/LICENSE | 0 .../alfresco-transformer-imagemagick/pom.xml | 66 -------- alfresco-docker-imagemagick/docker/pom.xml | 59 ------- alfresco-docker-imagemagick/pom.xml | 135 +++++++++++++++- .../org/alfresco/transformer/Application.java | 0 .../transformer/ImageMagickController.java | 0 .../resources/templates/transformForm.html | 0 .../.maven-dockerignore | 1 + .../{docker => }/Dockerfile | 6 +- .../{docker => }/LICENSE | 0 .../alfresco-transformer-libreoffice/pom.xml | 76 --------- alfresco-docker-libreoffice/docker/pom.xml | 59 ------- alfresco-docker-libreoffice/pom.xml | 145 +++++++++++++++++- .../org/alfresco/transformer/Application.java | 0 .../alfresco/transformer/JodConverter.java | 0 .../JodConverterSharedInstance.java | 0 .../transformer/LibreOfficeController.java | 0 .../resources/templates/transformForm.html | 0 29 files changed, 405 insertions(+), 420 deletions(-) create mode 100644 alfresco-docker-alfresco-pdf-renderer/.maven-dockerignore rename alfresco-docker-alfresco-pdf-renderer/{docker => }/Dockerfile (68%) rename alfresco-docker-alfresco-pdf-renderer/{docker => }/LICENSE (100%) delete mode 100644 alfresco-docker-alfresco-pdf-renderer/alfresco-transformer-alfresco-pdf-renderer/pom.xml delete mode 100644 alfresco-docker-alfresco-pdf-renderer/docker/pom.xml rename alfresco-docker-alfresco-pdf-renderer/{alfresco-transformer-alfresco-pdf-renderer => }/src/main/java/org/alfresco/transformer/AlfrescoPdfRendererController.java (100%) rename alfresco-docker-alfresco-pdf-renderer/{alfresco-transformer-alfresco-pdf-renderer => }/src/main/java/org/alfresco/transformer/Application.java (100%) rename alfresco-docker-alfresco-pdf-renderer/{alfresco-transformer-alfresco-pdf-renderer => }/src/main/resources/templates/transformForm.html (100%) create mode 100644 alfresco-docker-imagemagick/.maven-dockerignore rename alfresco-docker-imagemagick/{docker => }/Dockerfile (61%) rename alfresco-docker-imagemagick/{docker => }/LICENSE (100%) delete mode 100644 alfresco-docker-imagemagick/alfresco-transformer-imagemagick/pom.xml delete mode 100644 alfresco-docker-imagemagick/docker/pom.xml rename alfresco-docker-imagemagick/{alfresco-transformer-imagemagick => }/src/main/java/org/alfresco/transformer/Application.java (100%) rename alfresco-docker-imagemagick/{alfresco-transformer-imagemagick => }/src/main/java/org/alfresco/transformer/ImageMagickController.java (100%) rename alfresco-docker-imagemagick/{alfresco-transformer-imagemagick => }/src/main/resources/templates/transformForm.html (100%) create mode 100644 alfresco-docker-libreoffice/.maven-dockerignore rename alfresco-docker-libreoffice/{docker => }/Dockerfile (73%) rename alfresco-docker-libreoffice/{docker => }/LICENSE (100%) delete mode 100644 alfresco-docker-libreoffice/alfresco-transformer-libreoffice/pom.xml delete mode 100644 alfresco-docker-libreoffice/docker/pom.xml rename alfresco-docker-libreoffice/{alfresco-transformer-libreoffice => }/src/main/java/org/alfresco/transformer/Application.java (100%) rename alfresco-docker-libreoffice/{alfresco-transformer-libreoffice => }/src/main/java/org/alfresco/transformer/JodConverter.java (100%) rename alfresco-docker-libreoffice/{alfresco-transformer-libreoffice => }/src/main/java/org/alfresco/transformer/JodConverterSharedInstance.java (100%) rename alfresco-docker-libreoffice/{alfresco-transformer-libreoffice => }/src/main/java/org/alfresco/transformer/LibreOfficeController.java (100%) rename alfresco-docker-libreoffice/{alfresco-transformer-libreoffice => }/src/main/resources/templates/transformForm.html (100%) diff --git a/alfresco-docker-alfresco-pdf-renderer/.maven-dockerignore b/alfresco-docker-alfresco-pdf-renderer/.maven-dockerignore new file mode 100644 index 00000000..112bd182 --- /dev/null +++ b/alfresco-docker-alfresco-pdf-renderer/.maven-dockerignore @@ -0,0 +1 @@ +target/docker/ \ No newline at end of file diff --git a/alfresco-docker-alfresco-pdf-renderer/docker/Dockerfile b/alfresco-docker-alfresco-pdf-renderer/Dockerfile similarity index 68% rename from alfresco-docker-alfresco-pdf-renderer/docker/Dockerfile rename to alfresco-docker-alfresco-pdf-renderer/Dockerfile index a971f750..43afdefc 100644 --- a/alfresco-docker-alfresco-pdf-renderer/docker/Dockerfile +++ b/alfresco-docker-alfresco-pdf-renderer/Dockerfile @@ -4,9 +4,9 @@ FROM quay.io/alfresco/alfresco-base-java:9 ENV ALFRESCO_PDF_RENDERER_LIB_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/releases/content/org/alfresco/alfresco-pdf-renderer/1.1/alfresco-pdf-renderer-1.1-linux.tgz -COPY target/alfresco-transformer-alfresco-pdf-renderer*.jar /usr/bin +COPY target/alfresco-docker-alfresco-pdf-renderer*.jar /usr/bin -RUN ln /usr/bin/alfresco-transformer-alfresco-pdf-renderer*.jar /usr/bin/alfresco-transformer-alfresco-pdf-renderer.jar && \ +RUN ln /usr/bin/alfresco-docker-alfresco-pdf-renderer*.jar /usr/bin/alfresco-docker-alfresco-pdf-renderer.jar && \ yum install -y wget && \ wget $ALFRESCO_PDF_RENDERER_LIB_RPM_URL && \ tar xf alfresco-pdf-renderer-*-linux.tgz -C /usr/bin && \ @@ -16,5 +16,5 @@ RUN ln /usr/bin/alfresco-transformer-alfresco-pdf-renderer*.jar /usr/bin/alfresc EXPOSE 8090 -ENTRYPOINT java -jar /usr/bin/alfresco-transformer-alfresco-pdf-renderer.jar +ENTRYPOINT java -jar /usr/bin/alfresco-docker-alfresco-pdf-renderer.jar diff --git a/alfresco-docker-alfresco-pdf-renderer/docker/LICENSE b/alfresco-docker-alfresco-pdf-renderer/LICENSE similarity index 100% rename from alfresco-docker-alfresco-pdf-renderer/docker/LICENSE rename to alfresco-docker-alfresco-pdf-renderer/LICENSE diff --git a/alfresco-docker-alfresco-pdf-renderer/alfresco-transformer-alfresco-pdf-renderer/pom.xml b/alfresco-docker-alfresco-pdf-renderer/alfresco-transformer-alfresco-pdf-renderer/pom.xml deleted file mode 100644 index 23b84b34..00000000 --- a/alfresco-docker-alfresco-pdf-renderer/alfresco-transformer-alfresco-pdf-renderer/pom.xml +++ /dev/null @@ -1,66 +0,0 @@ - - 4.0.0 - - - org.alfresco - alfresco-docker-transformer-alfresco-pdf-renderer - 0.1-SNAPSHOT - ../pom.xml - - - alfresco-transformer-alfresco-pdf-renderer - 0.1-SNAPSHOT - jar - - - - - org.springframework.boot - spring-boot-starter-parent - ${dependency.spring-boot.version} - pom - import - - - - - - - org.alfresco - alfresco-transformer-base - ${dependency.alfresco-transformer-base.version} - - - org.springframework.boot - spring-boot-starter-thymeleaf - - - org.springframework.boot - spring-boot-starter-test - test - - - org.alfresco - alfresco-core - ${dependency.alfresco-core.version} - - - - - - - org.springframework.boot - spring-boot-maven-plugin - 2.0.0.RELEASE - - - - repackage - - - - - - - - diff --git a/alfresco-docker-alfresco-pdf-renderer/docker/pom.xml b/alfresco-docker-alfresco-pdf-renderer/docker/pom.xml deleted file mode 100644 index be130103..00000000 --- a/alfresco-docker-alfresco-pdf-renderer/docker/pom.xml +++ /dev/null @@ -1,59 +0,0 @@ - - 4.0.0 - - - org.alfresco - alfresco-docker-transformer-alfresco-pdf-renderer - 0.1-SNAPSHOT - ../pom.xml - - - alfresco-docker-builder-alfresco-pdf-renderer - Alfresco Content Services alfresco-pdf-renderer Docker image builder - pom - - - ${project.version} - - - - - org.alfresco - alfresco-transformer-alfresco-pdf-renderer - ${dependency.alfresco-transformer-alfresco-pdf-renderer.version} - jar - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - 3.0.2 - - - copy-resources - process-resources - - copy - - - - - org.alfresco - alfresco-transformer-alfresco-pdf-renderer - ${dependency.alfresco-transformer-alfresco-pdf-renderer.version} - jar - false - ${project.build.directory} - - - - - - - - - - diff --git a/alfresco-docker-alfresco-pdf-renderer/pom.xml b/alfresco-docker-alfresco-pdf-renderer/pom.xml index eeaf2511..7459541a 100644 --- a/alfresco-docker-alfresco-pdf-renderer/pom.xml +++ b/alfresco-docker-alfresco-pdf-renderer/pom.xml @@ -1,5 +1,10 @@ 4.0.0 + alfresco-docker-alfresco-pdf-renderer + Alfresco Docker Pdf Renderer + jar + + 0.1-SNAPSHOT org.alfresco @@ -8,14 +13,128 @@ ../pom.xml - alfresco-docker-transformer-alfresco-pdf-renderer - Alfresco Docker Transformer Alfresco PDF Renderer - 0.1-SNAPSHOT - pom - - alfresco-transformer-alfresco-pdf-renderer - docker - + + + + org.springframework.boot + spring-boot-starter-parent + ${dependency.spring-boot.version} + pom + import + + + + + + org.alfresco + alfresco-transformer-base + ${dependency.alfresco-transformer-base.version} + + + org.springframework.boot + spring-boot-starter-thymeleaf + + + org.springframework.boot + spring-boot-starter-test + test + + + org.alfresco + alfresco-core + ${dependency.alfresco-core.version} + + + + + + + org.springframework.boot + spring-boot-maven-plugin + 2.0.0.RELEASE + + + + repackage + + + + + + + + + + + dockerImages + + + + io.fabric8 + fabric8-maven-plugin + 3.5.37 + + + + alfresco/${artifactId} + + ${project.basedir}/ + + ${project.version} + + + + + + + + buildImage + + build + + + + + + + + + + release + + + + io.fabric8 + fabric8-maven-plugin + 3.5.37 + + + + alfresco/${artifactId} + quay.io + + ${project.basedir}/ + + ${project.version} + + + + + + + + buildAndPush + + build + push + + + + + + + + diff --git a/alfresco-docker-alfresco-pdf-renderer/alfresco-transformer-alfresco-pdf-renderer/src/main/java/org/alfresco/transformer/AlfrescoPdfRendererController.java b/alfresco-docker-alfresco-pdf-renderer/src/main/java/org/alfresco/transformer/AlfrescoPdfRendererController.java similarity index 100% rename from alfresco-docker-alfresco-pdf-renderer/alfresco-transformer-alfresco-pdf-renderer/src/main/java/org/alfresco/transformer/AlfrescoPdfRendererController.java rename to alfresco-docker-alfresco-pdf-renderer/src/main/java/org/alfresco/transformer/AlfrescoPdfRendererController.java diff --git a/alfresco-docker-alfresco-pdf-renderer/alfresco-transformer-alfresco-pdf-renderer/src/main/java/org/alfresco/transformer/Application.java b/alfresco-docker-alfresco-pdf-renderer/src/main/java/org/alfresco/transformer/Application.java similarity index 100% rename from alfresco-docker-alfresco-pdf-renderer/alfresco-transformer-alfresco-pdf-renderer/src/main/java/org/alfresco/transformer/Application.java rename to alfresco-docker-alfresco-pdf-renderer/src/main/java/org/alfresco/transformer/Application.java diff --git a/alfresco-docker-alfresco-pdf-renderer/alfresco-transformer-alfresco-pdf-renderer/src/main/resources/templates/transformForm.html b/alfresco-docker-alfresco-pdf-renderer/src/main/resources/templates/transformForm.html similarity index 100% rename from alfresco-docker-alfresco-pdf-renderer/alfresco-transformer-alfresco-pdf-renderer/src/main/resources/templates/transformForm.html rename to alfresco-docker-alfresco-pdf-renderer/src/main/resources/templates/transformForm.html diff --git a/alfresco-docker-imagemagick/.maven-dockerignore b/alfresco-docker-imagemagick/.maven-dockerignore new file mode 100644 index 00000000..112bd182 --- /dev/null +++ b/alfresco-docker-imagemagick/.maven-dockerignore @@ -0,0 +1 @@ +target/docker/ \ No newline at end of file diff --git a/alfresco-docker-imagemagick/docker/Dockerfile b/alfresco-docker-imagemagick/Dockerfile similarity index 61% rename from alfresco-docker-imagemagick/docker/Dockerfile rename to alfresco-docker-imagemagick/Dockerfile index b9b9ea6f..7cf9e932 100644 --- a/alfresco-docker-imagemagick/docker/Dockerfile +++ b/alfresco-docker-imagemagick/Dockerfile @@ -2,12 +2,12 @@ FROM quay.io/alfresco/alfresco-base-java:9 -ENV IMAGEMAGICK_RPM_URL=https://www.imagemagick.org/download/linux/CentOS/x86_64/ImageMagick-7.0.7-25.x86_64.rpm -ENV IMAGEMAGICK_LIB_RPM_URL=https://www.imagemagick.org/download/linux/CentOS/x86_64/ImageMagick-libs-7.0.7-25.x86_64.rpm +ENV IMAGEMAGICK_RPM_URL=https://www.imagemagick.org/download/linux/CentOS/x86_64/ImageMagick-7.0.7-26.x86_64.rpm +ENV IMAGEMAGICK_LIB_RPM_URL=https://www.imagemagick.org/download/linux/CentOS/x86_64/ImageMagick-libs-7.0.7-26.x86_64.rpm -COPY target/alfresco-transformer-imagemagick*.jar /usr/bin +COPY target/alfresco-docker-imagemagick*.jar /usr/bin -RUN ln /usr/bin/alfresco-transformer-imagemagick*.jar /usr/bin/alfresco-transformer-imagemagick.jar && \ +RUN ln /usr/bin/alfresco-docker-imagemagick*.jar /usr/bin/alfresco-docker-imagemagick.jar && \ yum install -y wget && \ wget $IMAGEMAGICK_RPM_URL && \ wget $IMAGEMAGICK_LIB_RPM_URL && \ @@ -18,4 +18,4 @@ RUN ln /usr/bin/alfresco-transformer-imagemagick*.jar /usr/bin/alfresco-transfor EXPOSE 8090 -ENTRYPOINT java -jar /usr/bin/alfresco-transformer-imagemagick.jar +ENTRYPOINT java -jar /usr/bin/alfresco-docker-imagemagick.jar diff --git a/alfresco-docker-imagemagick/docker/LICENSE b/alfresco-docker-imagemagick/LICENSE similarity index 100% rename from alfresco-docker-imagemagick/docker/LICENSE rename to alfresco-docker-imagemagick/LICENSE diff --git a/alfresco-docker-imagemagick/alfresco-transformer-imagemagick/pom.xml b/alfresco-docker-imagemagick/alfresco-transformer-imagemagick/pom.xml deleted file mode 100644 index 764e6f0d..00000000 --- a/alfresco-docker-imagemagick/alfresco-transformer-imagemagick/pom.xml +++ /dev/null @@ -1,66 +0,0 @@ - - 4.0.0 - - - org.alfresco - alfresco-docker-transformer-imagemagick - 0.1-SNAPSHOT - ../pom.xml - - - alfresco-transformer-imagemagick - 0.1-SNAPSHOT - jar - - - - - org.springframework.boot - spring-boot-starter-parent - ${dependency.spring-boot.version} - pom - import - - - - - - - org.alfresco - alfresco-transformer-base - ${dependency.alfresco-transformer-base.version} - - - org.springframework.boot - spring-boot-starter-thymeleaf - - - org.springframework.boot - spring-boot-starter-test - test - - - org.alfresco - alfresco-core - ${dependency.alfresco-core.version} - - - - - - - org.springframework.boot - spring-boot-maven-plugin - 2.0.0.RELEASE - - - - repackage - - - - - - - - diff --git a/alfresco-docker-imagemagick/docker/pom.xml b/alfresco-docker-imagemagick/docker/pom.xml deleted file mode 100644 index b74c931d..00000000 --- a/alfresco-docker-imagemagick/docker/pom.xml +++ /dev/null @@ -1,59 +0,0 @@ - - 4.0.0 - - - org.alfresco - alfresco-docker-transformer-imagemagick - 0.1-SNAPSHOT - ../pom.xml - - - alfresco-docker-builder-imagemagick - Alfresco Content Services ImageMagick Docker image builder - pom - - - ${project.version} - - - - - org.alfresco - alfresco-transformer-imagemagick - ${dependency.alfresco-transformer-imagemagick.version} - jar - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - 3.0.2 - - - copy-resources - process-resources - - copy - - - - - org.alfresco - alfresco-transformer-imagemagick - ${dependency.alfresco-transformer-imagemagick.version} - jar - false - ${project.build.directory} - - - - - - - - - - diff --git a/alfresco-docker-imagemagick/pom.xml b/alfresco-docker-imagemagick/pom.xml index 34a7febb..31452caf 100644 --- a/alfresco-docker-imagemagick/pom.xml +++ b/alfresco-docker-imagemagick/pom.xml @@ -1,5 +1,10 @@ 4.0.0 + alfresco-docker-imagemagick + Alfresco Docker ImageMagick + jar + + 0.1-SNAPSHOT org.alfresco @@ -8,14 +13,128 @@ ../pom.xml - alfresco-docker-transformer-imagemagick - Alfresco Docker Transformer ImageMagick - 0.1-SNAPSHOT - pom - - alfresco-transformer-imagemagick - docker - + + + + org.springframework.boot + spring-boot-starter-parent + ${dependency.spring-boot.version} + pom + import + + + + + + org.alfresco + alfresco-transformer-base + ${dependency.alfresco-transformer-base.version} + + + org.springframework.boot + spring-boot-starter-thymeleaf + + + org.springframework.boot + spring-boot-starter-test + test + + + org.alfresco + alfresco-core + ${dependency.alfresco-core.version} + + + + + + + org.springframework.boot + spring-boot-maven-plugin + 2.0.0.RELEASE + + + + repackage + + + + + + + + + + + dockerImages + + + + io.fabric8 + fabric8-maven-plugin + 3.5.37 + + + + alfresco/${artifactId} + + ${project.basedir}/ + + ${project.version} + + + + + + + + buildImage + + build + + + + + + + + + + release + + + + io.fabric8 + fabric8-maven-plugin + 3.5.37 + + + + alfresco/${artifactId} + quay.io + + ${project.basedir}/ + + ${project.version} + + + + + + + + buildAndPush + + build + push + + + + + + + + diff --git a/alfresco-docker-imagemagick/alfresco-transformer-imagemagick/src/main/java/org/alfresco/transformer/Application.java b/alfresco-docker-imagemagick/src/main/java/org/alfresco/transformer/Application.java similarity index 100% rename from alfresco-docker-imagemagick/alfresco-transformer-imagemagick/src/main/java/org/alfresco/transformer/Application.java rename to alfresco-docker-imagemagick/src/main/java/org/alfresco/transformer/Application.java diff --git a/alfresco-docker-imagemagick/alfresco-transformer-imagemagick/src/main/java/org/alfresco/transformer/ImageMagickController.java b/alfresco-docker-imagemagick/src/main/java/org/alfresco/transformer/ImageMagickController.java similarity index 100% rename from alfresco-docker-imagemagick/alfresco-transformer-imagemagick/src/main/java/org/alfresco/transformer/ImageMagickController.java rename to alfresco-docker-imagemagick/src/main/java/org/alfresco/transformer/ImageMagickController.java diff --git a/alfresco-docker-imagemagick/alfresco-transformer-imagemagick/src/main/resources/templates/transformForm.html b/alfresco-docker-imagemagick/src/main/resources/templates/transformForm.html similarity index 100% rename from alfresco-docker-imagemagick/alfresco-transformer-imagemagick/src/main/resources/templates/transformForm.html rename to alfresco-docker-imagemagick/src/main/resources/templates/transformForm.html diff --git a/alfresco-docker-libreoffice/.maven-dockerignore b/alfresco-docker-libreoffice/.maven-dockerignore new file mode 100644 index 00000000..112bd182 --- /dev/null +++ b/alfresco-docker-libreoffice/.maven-dockerignore @@ -0,0 +1 @@ +target/docker/ \ No newline at end of file diff --git a/alfresco-docker-libreoffice/docker/Dockerfile b/alfresco-docker-libreoffice/Dockerfile similarity index 73% rename from alfresco-docker-libreoffice/docker/Dockerfile rename to alfresco-docker-libreoffice/Dockerfile index 4973f6f7..07f062c6 100644 --- a/alfresco-docker-libreoffice/docker/Dockerfile +++ b/alfresco-docker-libreoffice/Dockerfile @@ -4,9 +4,9 @@ FROM quay.io/alfresco/alfresco-base-java:9 ENV LIBREOFFICE_RPM_URL=http://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86_64/LibreOffice_5.4.5_Linux_x86-64_rpm.tar.gz -COPY target/alfresco-transformer-libreoffice*.jar /usr/bin +COPY target/alfresco-docker-libreoffice*.jar /usr/bin -RUN ln /usr/bin/alfresco-transformer-libreoffice*.jar /usr/bin/alfresco-transformer-libreoffice.jar && \ +RUN ln /usr/bin/alfresco-docker-libreoffice*.jar /usr/bin/alfresco-docker-libreoffice.jar && \ yum install -y wget && \ yum install -y cairo cups-libs libSM && \ wget $LIBREOFFICE_RPM_URL && \ @@ -18,4 +18,4 @@ RUN ln /usr/bin/alfresco-transformer-libreoffice*.jar /usr/bin/alfresco-transfor EXPOSE 8090 -ENTRYPOINT java -jar /usr/bin/alfresco-transformer-libreoffice.jar +ENTRYPOINT java -jar /usr/bin/alfresco-docker-libreoffice.jar diff --git a/alfresco-docker-libreoffice/docker/LICENSE b/alfresco-docker-libreoffice/LICENSE similarity index 100% rename from alfresco-docker-libreoffice/docker/LICENSE rename to alfresco-docker-libreoffice/LICENSE diff --git a/alfresco-docker-libreoffice/alfresco-transformer-libreoffice/pom.xml b/alfresco-docker-libreoffice/alfresco-transformer-libreoffice/pom.xml deleted file mode 100644 index 77070c4f..00000000 --- a/alfresco-docker-libreoffice/alfresco-transformer-libreoffice/pom.xml +++ /dev/null @@ -1,76 +0,0 @@ - - 4.0.0 - - - org.alfresco - alfresco-docker-transformer-libreoffice - 0.1-SNAPSHOT - ../pom.xml - - - alfresco-transformer-libreoffice - 0.1-SNAPSHOT - jar - - - - - org.springframework.boot - spring-boot-starter-parent - ${dependency.spring-boot.version} - pom - import - - - - - - - org.alfresco - alfresco-transformer-base - ${dependency.alfresco-transformer-base.version} - - - org.springframework.boot - spring-boot-starter-thymeleaf - - - org.springframework.boot - spring-boot-starter-test - test - - - org.alfresco - alfresco-core - ${dependency.alfresco-core.version} - - - org.alfresco - alfresco-jodconverter-core - 3.0.1.1 - - - org.apache.pdfbox - pdfbox - 2.0.8 - - - - - - - org.springframework.boot - spring-boot-maven-plugin - 2.0.0.RELEASE - - - - repackage - - - - - - - - diff --git a/alfresco-docker-libreoffice/docker/pom.xml b/alfresco-docker-libreoffice/docker/pom.xml deleted file mode 100644 index 28cb3f93..00000000 --- a/alfresco-docker-libreoffice/docker/pom.xml +++ /dev/null @@ -1,59 +0,0 @@ - - 4.0.0 - - - org.alfresco - alfresco-docker-transformer-libreoffice - 0.1-SNAPSHOT - ../pom.xml - - - alfresco-docker-builder-libreoffice - Alfresco Content Services LibreOffice Docker image builder - pom - - - ${project.version} - - - - - org.alfresco - alfresco-transformer-libreoffice - ${dependency.alfresco-transformer-libreoffice.version} - jar - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - 3.0.2 - - - copy-resources - process-resources - - copy - - - - - org.alfresco - alfresco-transformer-libreoffice - ${dependency.alfresco-transformer-libreoffice.version} - jar - false - ${project.build.directory} - - - - - - - - - - diff --git a/alfresco-docker-libreoffice/pom.xml b/alfresco-docker-libreoffice/pom.xml index d3d005ae..71c92651 100644 --- a/alfresco-docker-libreoffice/pom.xml +++ b/alfresco-docker-libreoffice/pom.xml @@ -1,5 +1,10 @@ 4.0.0 + alfresco-docker-libreoffice + Alfresco Docker LibreOffice + jar + + 0.1-SNAPSHOT org.alfresco @@ -8,14 +13,138 @@ ../pom.xml - alfresco-docker-transformer-libreoffice - Alfresco Docker Transformer LibreOffice - 0.1-SNAPSHOT - pom - - alfresco-transformer-libreoffice - docker - + + + + org.springframework.boot + spring-boot-starter-parent + ${dependency.spring-boot.version} + pom + import + + + + + + org.alfresco + alfresco-transformer-base + ${dependency.alfresco-transformer-base.version} + + + org.springframework.boot + spring-boot-starter-thymeleaf + + + org.springframework.boot + spring-boot-starter-test + test + + + org.alfresco + alfresco-core + ${dependency.alfresco-core.version} + + + org.alfresco + alfresco-jodconverter-core + 3.0.1.1 + + + org.apache.pdfbox + pdfbox + 2.0.8 + + + + + + + org.springframework.boot + spring-boot-maven-plugin + 2.0.0.RELEASE + + + + repackage + + + + + + + + + + + dockerImages + + + + io.fabric8 + fabric8-maven-plugin + 3.5.37 + + + + alfresco/${artifactId} + + ${project.basedir}/ + + ${project.version} + + + + + + + + buildImage + + build + + + + + + + + + + release + + + + io.fabric8 + fabric8-maven-plugin + 3.5.37 + + + + alfresco/${artifactId} + quay.io + + ${project.basedir}/ + + ${project.version} + + + + + + + + buildAndPush + + build + push + + + + + + + + diff --git a/alfresco-docker-libreoffice/alfresco-transformer-libreoffice/src/main/java/org/alfresco/transformer/Application.java b/alfresco-docker-libreoffice/src/main/java/org/alfresco/transformer/Application.java similarity index 100% rename from alfresco-docker-libreoffice/alfresco-transformer-libreoffice/src/main/java/org/alfresco/transformer/Application.java rename to alfresco-docker-libreoffice/src/main/java/org/alfresco/transformer/Application.java diff --git a/alfresco-docker-libreoffice/alfresco-transformer-libreoffice/src/main/java/org/alfresco/transformer/JodConverter.java b/alfresco-docker-libreoffice/src/main/java/org/alfresco/transformer/JodConverter.java similarity index 100% rename from alfresco-docker-libreoffice/alfresco-transformer-libreoffice/src/main/java/org/alfresco/transformer/JodConverter.java rename to alfresco-docker-libreoffice/src/main/java/org/alfresco/transformer/JodConverter.java diff --git a/alfresco-docker-libreoffice/alfresco-transformer-libreoffice/src/main/java/org/alfresco/transformer/JodConverterSharedInstance.java b/alfresco-docker-libreoffice/src/main/java/org/alfresco/transformer/JodConverterSharedInstance.java similarity index 100% rename from alfresco-docker-libreoffice/alfresco-transformer-libreoffice/src/main/java/org/alfresco/transformer/JodConverterSharedInstance.java rename to alfresco-docker-libreoffice/src/main/java/org/alfresco/transformer/JodConverterSharedInstance.java diff --git a/alfresco-docker-libreoffice/alfresco-transformer-libreoffice/src/main/java/org/alfresco/transformer/LibreOfficeController.java b/alfresco-docker-libreoffice/src/main/java/org/alfresco/transformer/LibreOfficeController.java similarity index 100% rename from alfresco-docker-libreoffice/alfresco-transformer-libreoffice/src/main/java/org/alfresco/transformer/LibreOfficeController.java rename to alfresco-docker-libreoffice/src/main/java/org/alfresco/transformer/LibreOfficeController.java diff --git a/alfresco-docker-libreoffice/alfresco-transformer-libreoffice/src/main/resources/templates/transformForm.html b/alfresco-docker-libreoffice/src/main/resources/templates/transformForm.html similarity index 100% rename from alfresco-docker-libreoffice/alfresco-transformer-libreoffice/src/main/resources/templates/transformForm.html rename to alfresco-docker-libreoffice/src/main/resources/templates/transformForm.html