Issue #40 - remove examples (should be committed separately), fix readme, revert to ubuntu and alpine as distro targets to be more precise

Signed-off-by: Jon Bartels <[email protected]>

Author: jonbartels

README.md

@@ -1,10 +1,11 @@
 <a name="top"></a>
 # Table of Contents
 
+* [Quick Reference](#quick-reference)
+    * [Where to get help](#quick-reference)
 * [Supported tags and respective Dockerfile links](#supported-tags)
 * [Supported Architectures](#supported-architectures)
-* [Quick Reference](#quick-reference)
-* [What is Mirth Connect](#what-is-connect)
+* [What is Open Integration Engine](#what-is-oie)
 * [How to use this image](#how-to-use)
     * [Start a Connect instance](#start-connect)
     * [Using `docker stack deploy` or `docker-compose`](#using-docker-compose)
@@ -19,32 +20,6 @@
 
 ------------
 
-<a name="supported-tags"></a>
-# Supported Images [↑](#top)
-
-All Open Integration Engine releases are packaged into the four following images:
-
-- `latest`, `latest-alpine`, `latest-alpine-jre`
-    - `4.5.2-tp.1-alpine`, `4.5.2-tp.1-alpine-jre`
-- `latest-alpine-jdk`
-    - `4.5.2-tp.1-alpine-jdk`
-- `latest-ubuntu`, `latest-ubuntu-jre`
-    - `4.5.2-tp.1-ubuntu`, `4.5.2-tp.1-ubuntu-jre`
-- `latest-ubuntu-jdk`
-    - `4.5.2-tp.1-ubuntu-jdk`
-
-------------
-
-<a name="supported-architectures"></a>
-# Supported Architectures [↑](#top)
-
-Docker images for OIE 4.5.2 and later versions support both `linux/amd64` and `linux/arm64` architectures. As an example, to pull the latest `linux/arm64` image, use the command
-```
-docker pull --platform linux/arm64 openintegrationengine/engine:latest
-```
-
-------------
-
 <a name="quick-reference"></a>
 # Quick Reference [↑](#top)
 
@@ -77,6 +52,32 @@ OpenIntegrationEngine is designed to be vendor-neutral, allowing healthcare orga
 
 ------------
 
+<a name="supported-tags"></a>
+# Supported Images [↑](#top)
+
+All Open Integration Engine releases are packaged into the four following images:
+
+- `latest`, `latest-alpine`, `latest-alpine-jre`
+    - `4.5.2-tp.1-alpine`, `4.5.2-tp.1-alpine-jre`
+- `latest-alpine-jdk`
+    - `4.5.2-tp.1-alpine-jdk`
+- `latest-ubuntu`, `latest-ubuntu-jre`
+    - `4.5.2-tp.1-ubuntu`, `4.5.2-tp.1-ubuntu-jre`
+- `latest-ubuntu-jdk`
+    - `4.5.2-tp.1-ubuntu-jdk`
+
+------------
+
+<a name="supported-architectures"></a>
+# Supported Architectures [↑](#top)
+
+Docker images for OIE 4.5.2 and later versions support both `linux/amd64` and `linux/arm64` architectures. As an example, to pull the latest `linux/arm64` image, use the command
+```
+docker pull --platform linux/arm64 openintegrationengine/engine:latest
+```
+
+------------
+
 <a name="how-to-use"></a>
 # How to use this image [↑](#top)
 

deploy/Dockerfile

@@ -36,9 +36,10 @@ RUN chown -R ${UID}:${GID} /opt/engine
 
 
 ##########################################
-#     Apk based Images
+#     Alpine based Images
 ##########################################
-FROM eclipse-temurin:$BASE_IMAGE_TAG AS apk
+FROM eclipse-temurin:$BASE_IMAGE_TAG AS alpine
+
 ARG UID
 ARG GID
 ARG OIE_RELEASE_VERSION
@@ -57,19 +58,23 @@ LABEL "org.opencontainers.image.authors"="The Open Integration Engine Project an
 
 COPY --from=downloader /opt/engine /opt/engine
 RUN apk add --no-cache bash \
-    && adduser -D -H -u $UID engine engine
+    && adduser -D -H -u $UID engine engine \
+
 VOLUME /opt/engine/appdata
 VOLUME /opt/engine/custom-extensions
+
 WORKDIR /opt/engine
 EXPOSE 8443
 USER engine
+
 ENTRYPOINT ["./entrypoint.sh"]
 CMD ["./oieserver"]
 
 ##########################################
-#     Apt based Images
+#     Ubuntu based Images
 ##########################################
-FROM eclipse-temurin:$BASE_IMAGE_TAG AS apt
+FROM eclipse-temurin:$BASE_IMAGE_TAG AS ubuntu
+
 ARG UID
 ARG GID
 ARG OIE_RELEASE_VERSION
@@ -88,11 +93,15 @@ LABEL "org.opencontainers.image.authors"="The Open Integration Engine Project an
 
 COPY --from=downloader /opt/engine /opt/engine
 RUN groupadd --gid ${GID} engine \
-    && useradd -u ${UID} -g ${GID} -M engine
+    && useradd --no-log-init -u ${UID} -g ${GID} -M engine \
+
 VOLUME /opt/engine/appdata
 VOLUME /opt/engine/custom-extensions
+
 WORKDIR /opt/engine
 EXPOSE 8443
 USER engine
+
 ENTRYPOINT ["./entrypoint.sh"]
 CMD ["./oieserver"]
+

deploy/compose.yaml

@@ -5,7 +5,7 @@ services:
     image: openintegrationengine/engine
     build:
       dockerfile: Dockerfile
-      target: apt
+      target: ubuntu
       context: .
       args:
         BASE_IMAGE_TAG: ${UBUNTU_JDK_TAG:?}
@@ -22,7 +22,7 @@ services:
     image: openintegrationengine/engine
     build:
       dockerfile: Dockerfile
-      target: apt
+      target: ubuntu
       context: .
       args:
         BASE_IMAGE_TAG: ${UBUNTU_JRE_TAG:?}
@@ -39,7 +39,7 @@ services:
     image: openintegrationengine/engine
     build:
       dockerfile: Dockerfile
-      target: apk
+      target: alpine
       context: .
       args:
         BASE_IMAGE_TAG: ${ALPINE_JDK_TAG:?}
@@ -54,7 +54,7 @@ services:
     image: openintegrationengine/engine
     build:
       dockerfile: Dockerfile
-      target: apk
+      target: alpine
       context: .
       args:
         BASE_IMAGE_TAG: ${ALPINE_JRE_TAG:?}