Issue 40, DRY up dockerfile

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

Author: jonbartels

deploy/Dockerfile

@@ -1,7 +1,6 @@
 # syntax=docker/dockerfile:1
 
-ARG ALPINE_TAG
-ARG UBUNTU_TAG
+ARG BASE_IMAGE_TAG
 
 ARG OIE_RELEASE_VERSION
 
@@ -35,14 +34,11 @@ RUN rm -rf cli-lib manager-lib \
 
 RUN chown -R ${UID}:${GID} /opt/engine
 
+
 ##########################################
-#
-#     Alpine Images
-#
+#     Apk based Images
 ##########################################
-
-FROM eclipse-temurin:$ALPINE_TAG AS alpine
-
+FROM eclipse-temurin:$BASE_IMAGE_TAG AS apk
 ARG UID
 ARG GID
 ARG OIE_RELEASE_VERSION
@@ -60,28 +56,20 @@ LABEL "org.opencontainers.image.authors"="The Open Integration Engine Project an
       "org.opencontainers.image.version"="${OIE_RELEASE_VERSION?:}"
 
 COPY --from=downloader /opt/engine /opt/engine
-
 RUN apk add --no-cache bash \
-    && adduser -D -H -u $UID engine engine # Create both group and user "engine" at the same time
-
+    && 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"]
 
 ##########################################
-#
-#     Ubuntu Image
-#
+#     Apt based Images
 ##########################################
-
-FROM eclipse-temurin:$UBUNTU_TAG AS ubuntu
-
+FROM eclipse-temurin:$BASE_IMAGE_TAG AS apt
 ARG UID
 ARG GID
 ARG OIE_RELEASE_VERSION
@@ -99,16 +87,12 @@ LABEL "org.opencontainers.image.authors"="The Open Integration Engine Project an
       "org.opencontainers.image.version"="${OIE_RELEASE_VERSION?:}"
 
 COPY --from=downloader /opt/engine /opt/engine
-
 RUN groupadd --gid ${GID} engine \
     && useradd -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,11 +5,10 @@ services:
     image: openintegrationengine/engine
     build:
       dockerfile: Dockerfile
-      target: ubuntu
+      target: apt
       context: .
-      args: &jdk-args
-        UBUNTU_TAG: ${UBUNTU_JDK_TAG:?}
-        ALPINE_TAG: ${ALPINE_JDK_TAG:?}
+      args:
+        BASE_IMAGE_TAG: ${UBUNTU_JDK_TAG:?}
         OIE_RELEASE_VERSION: ${OIE_RELEASE_VERSION:?}
         OIE_RELEASE_URL: ${OIE_RELEASE_URL:?}
       platforms: &platforms
@@ -23,11 +22,10 @@ services:
     image: openintegrationengine/engine
     build:
       dockerfile: Dockerfile
-      target: ubuntu
+      target: apt
       context: .
-      args: &jre-tags
-        UBUNTU_TAG: ${UBUNTU_JRE_TAG:?}
-        ALPINE_TAG: ${ALPINE_JRE_TAG:?}
+      args:
+        BASE_IMAGE_TAG: ${UBUNTU_JRE_TAG:?}
         OIE_RELEASE_VERSION: ${OIE_RELEASE_VERSION:?}
         OIE_RELEASE_URL: ${OIE_RELEASE_URL:?}
       platforms: *platforms
@@ -41,9 +39,12 @@ services:
     image: openintegrationengine/engine
     build:
       dockerfile: Dockerfile
-      target: alpine
+      target: apk
       context: .
-      args: *jdk-args
+      args:
+        BASE_IMAGE_TAG: ${ALPINE_JDK_TAG:?}
+        OIE_RELEASE_VERSION: ${OIE_RELEASE_VERSION:?}
+        OIE_RELEASE_URL: ${OIE_RELEASE_URL:?}
       platforms: *platforms
       tags:
         - openintegrationengine/engine:latest-alpine-jdk
@@ -53,9 +54,12 @@ services:
     image: openintegrationengine/engine
     build:
       dockerfile: Dockerfile
-      target: alpine
+      target: apk
       context: .
-      args: *jre-tags
+      args:
+        BASE_IMAGE_TAG: ${ALPINE_JRE_TAG:?}
+        OIE_RELEASE_VERSION: ${OIE_RELEASE_VERSION:?}
+        OIE_RELEASE_URL: ${OIE_RELEASE_URL:?}
       platforms: *platforms
       tags:
         - openintegrationengine/engine:latest