Merge pull request #4 from aborroy/feature/MavenDockerBuild

Support building image from maven build.
aborroy · Sep 21, 2021 · 9847882 · 9847882
2 parents 7788ead + 2159f83
commit 9847882
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 4 deletions.
diff --git a/ats-transformer-ocr/Dockerfile b/ats-transformer-ocr/Dockerfile
@@ -1,4 +1,8 @@
-FROM jbarlow83/ocrmypdf
+FROM ubuntu:latest
+
+RUN apt-get update \
+    && apt-get upgrade -y \
+    && apt-get install -y ocrmypdf
 
 # Install OpenJDK 11
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'

diff --git a/ats-transformer-ocr/pom.xml b/ats-transformer-ocr/pom.xml
@@ -16,6 +16,7 @@
 
 	<properties>
 		<alfresco.transformer.base.version>2.5.4-SNAPSHOT</alfresco.transformer.base.version>
+		<image.tag>latest</image.tag>
 	</properties>
 
 	<dependencies>
@@ -43,6 +44,27 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<groupId>io.fabric8</groupId>
+				<artifactId>docker-maven-plugin</artifactId>
+				<version>0.34.1</version>
+				<configuration>
+					<images>
+						<image>
+							<name>alfresco/tengine-ocr:${image.tag}</name>
+						</image>
+					</images>
+				</configuration>
+				<executions>
+					<execution>
+						<id>build-image</id>
+						<phase>package</phase>
+						<goals>
+							<goal>build</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 

diff --git a/...ocr/src/main/java/org/alfresco/transformer/executors/PdfToOcrdPdfTransformerExecutor.java b/...ocr/src/main/java/org/alfresco/transformer/executors/PdfToOcrdPdfTransformerExecutor.java
@@ -41,7 +41,7 @@ public class PdfToOcrdPdfTransformerExecutor implements JavaExecutor
 	public String getTransformerId() {
 		return "ocr";
 	}
-	
+
     @Override
     public void call(File sourceFile, File targetFile, String... args) throws TransformException
     {
@@ -50,12 +50,12 @@ public void call(File sourceFile, File targetFile, String... args) throws Transf
         {
 
             Process process = Runtime.getRuntime().exec(
-                    String.format("/usr/local/bin/ocrmypdf " + sourceFile.getPath() + " " + targetFile.getPath()));
+                    String.format("/usr/bin/ocrmypdf " + sourceFile.getPath() + " " + targetFile.getPath()));
             StreamGobbler streamGobbler = new StreamGobbler(process.getInputStream(), System.out::println);
             Executors.newSingleThreadExecutor().submit(streamGobbler);
             process.waitFor();
 
-        } 
+        }
         catch (Exception e)
         {
             throw new TransformException(HttpStatus.INTERNAL_SERVER_ERROR.value(),