From b1851f461e0bfa334f662d32d032c7767e60625e Mon Sep 17 00:00:00 2001
From: Eric van der Vlist <vdv@dyomedea.com>
Date: Wed, 14 Feb 2018 18:21:12 +0100
Subject: [PATCH] Supporting both CE and PE

---
 Dockerfile            | 12 +++++++++---
 docker-compose-ce.yml | 11 +++++++++++
 docker-compose-pe.yml | 19 +++++++++++++++++++
 docker-compose.yml    |  6 ------
 4 files changed, 39 insertions(+), 9 deletions(-)
 create mode 100644 docker-compose-ce.yml
 create mode 100644 docker-compose-pe.yml
 delete mode 100644 docker-compose.yml

diff --git a/Dockerfile b/Dockerfile
index 18435eb..d445848 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,17 @@
 FROM tomcat:alpine
+
+ARG tag
+ARG build
+
 RUN \
     cd /tmp \
     && mkdir orbeon \
     && cd orbeon \
-    && wget https://github.com/orbeon/orbeon-forms/releases/download/tag-release-2017.2-ce/orbeon-2017.2.201712300816-CE.zip \
-    && unzip orbeon-2017.2.201712300816-CE.zip \
-    && cd orbeon-2017.2.201712300816-CE \
+    && echo "tag: $tag" \
+    && echo "build: $build" \
+    && wget https://github.com/orbeon/orbeon-forms/releases/download/$tag/$build.zip \
+    && unzip $build.zip \
+    && cd $build \
     && unzip orbeon.war \
     && rm -rf /usr/local/tomcat/webapps \
     && mkdir -p /usr/local/tomcat/webapps/ROOT \
diff --git a/docker-compose-ce.yml b/docker-compose-ce.yml
new file mode 100644
index 0000000..0df0977
--- /dev/null
+++ b/docker-compose-ce.yml
@@ -0,0 +1,11 @@
+version: "3"
+services:
+    servlet: 
+        build: 
+            context: .
+            args:
+                tag: "tag-release-2017.2-ce"
+                build: "orbeon-2017.2.201712300816-CE"
+        image: orbeon-ce
+        ports: 
+            - "8080:8080"
diff --git a/docker-compose-pe.yml b/docker-compose-pe.yml
new file mode 100644
index 0000000..5712b98
--- /dev/null
+++ b/docker-compose-pe.yml
@@ -0,0 +1,19 @@
+version: "3.3"
+services:
+    servlet: 
+        build: 
+            context: .
+            args:
+                tag: "tag-release-2017.2-ce"
+                build: "orbeon-2017.2.201712300806-PE"
+        image: orbeon-pe
+        secrets:
+            - source: license
+              target: /usr/local/tomcat/webapps/ROOT/WEB-INF/resources/config/license.xml
+        ports: 
+            - "8080:8080"
+
+secrets:
+    license:
+        file: ~/.orbeon/license.xml
+
diff --git a/docker-compose.yml b/docker-compose.yml
deleted file mode 100644
index 0333bab..0000000
--- a/docker-compose.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-version: "3"
-services:
-    servlet: 
-        build: .
-        ports: 
-            - "8080:8080"