Merge branch 'development' into 'master'

Development

See merge request !23

Dockerfile

-ARG BASE_REGISTRY=registry1.dsop.mil
-ARG BASE_IMAGE=redhat/ubi/ubi8
-ARG BASE_TAG=8.3
-
-FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
-
-ARG VERSION=1.2.1
-
-
-ARG USERNAME=benjo
-ARG GROUPNAME=benjo
-
-ARG UID=1000
-ARG GID=1000
-
-USER root
-WORKDIR /tmp
-
-COPY \
-  LICENSE \
-  README.md \
-  courseware-editor.tar.gz \
-  config/appsettings.json \
-  config/config.json \
-  dumb-init \
-  scripts/start.sh \
-  ./
-
-RUN groupadd --gid $GID $GROUPNAME && \
-      useradd --uid $UID --gid $GID $USERNAME && \
-      yum install -y libicu curl && \
-      yum clean all && \
-      rm -rf /var/cache/dnf && \
-      tar -zxf courseware-editor.tar.gz && \
-      chown -R $UID:$GID /tmp/* && \
-      chmod 755 dumb-init start.sh && \
-      mv courseware-editor /courseware-editor && \
-      mv config.json /courseware-editor && \
-      mv start.sh /courseware-editor && \
-      mv dumb-init /usr/local/bin && \
-      mv LICENSE README.md /courseware-editor && \
-      rm -rf ./*
-
-WORKDIR /courseware-editor
-
-ENV WORKSPACE_PATH=/modules
-
-USER $UID:$GID
-
-EXPOSE 1337
-
-HEALTHCHECK --interval=12s --timeout=10s --start-period=30s \
-  CMD curl --fail http://localhost/api/v1/heartbeat || exit 1
-
-ENTRYPOINT ["/usr/local/bin/dumb-init", "--"]
-
-WORKDIR /courseware-editor/server
-
-CMD ["/courseware-editor/start.sh"]
+ARG BASE_REGISTRY=registry1.dsop.mil
+ARG BASE_IMAGE=redhat/ubi/ubi8
+ARG BASE_TAG=8.4
+
+FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
+
+ARG VERSION=1.6.0
+
+
+ARG USERNAME=benjo
+ARG GROUPNAME=benjo
+
+ARG UID=1000
+ARG GID=1000
+
+USER root
+WORKDIR /tmp
+
+COPY \
+  LICENSE \
+  README.md \
+  courseware-editor.tar.gz \
+  config/appsettings.json \
+  config/config.json \
+  dumb-init \
+  scripts/start.sh \
+  ./
+
+RUN groupadd --gid $GID $GROUPNAME && \
+      useradd --uid $UID --gid $GID $USERNAME && \
+      yum install -y libicu curl && \
+      yum clean all && \
+      rm -rf /var/cache/dnf && \
+      tar -zxf courseware-editor.tar.gz && \
+      chown -R $UID:$GID /tmp/* && \
+      chmod 755 dumb-init start.sh && \
+      mv courseware-editor /courseware-editor && \
+      mv config.json /courseware-editor && \
+      mv start.sh /courseware-editor && \
+      mv dumb-init /usr/local/bin && \
+      mv LICENSE README.md /courseware-editor && \
+      rm -rf ./*
+
+WORKDIR /courseware-editor
+
+ENV WORKSPACE_PATH=/modules
+
+USER $UID:$GID
+
+EXPOSE 1337
+
+HEALTHCHECK --interval=12s --timeout=10s --start-period=30s \
+  CMD curl --fail http://localhost/api/v1/heartbeat || exit 1
+
+ENTRYPOINT ["/usr/local/bin/dumb-init", "--"]
+
+WORKDIR /courseware-editor/server
+
+CMD ["/courseware-editor/start.sh"]

hardening_manifest.yaml

@@ -8,13 +8,13 @@ name: "beast-code/courseware-editor/base-image"
 # The most specific version should be the first tag and will be shown
 # on ironbank.dsop.io
 tags:
-- "1.4.0"
+- "1.6.0"
 - "latest"
 
 # Build args passed to Dockerfile ARGs
 args:
   BASE_IMAGE: "redhat/ubi/ubi8"
-  BASE_TAG: "8.3"
+  BASE_TAG: "8.4"
 
 # Docker image labels
 labels:
@@ -27,7 +27,7 @@ labels:
   org.opencontainers.image.url: "https://beast-code.com/products/courseware-editor"
   ## Name of the distributing entity, organization or individual
   org.opencontainers.image.vendor: "Beast Code, LLC"
-  org.opencontainers.image.version: "1.4.0"
+  org.opencontainers.image.version: "1.6.0"
   ## Keywords to help with search (ex. "cicd,gitops,golang")
   mil.dso.ironbank.image.keywords: "digital twin, 3D"
   ## This value can be "opensource" or "commercial"
@@ -44,7 +44,7 @@ resources:
   url: s3://beast-code.core/courseware-editor.tar.gz
   validation:
     type: sha256
-    value: 24889fe86f7c1e04138228a1e6ceea58b65eb5f93e7843edda33292408918b5a
+    value: 5f5ecddea2447892ea4fb50a7e1ed90fecc48fb7831655cbdeb66c89e4f860aa
 - auth:
     id: beast
     region: us-east-2