diff --git a/Dockerfile b/Dockerfile index 3e50957a8abe0920edd8719a84b99a0f446f477d..5eaf9174b89fe019923ffcf8c299755bdcca0100 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,13 @@ -ARG BASE_REGISTRY=registry1.dsop.io +ARG BASE_REGISTRY=registry1.dso.mil ARG BASE_IMAGE=ironbank/opensource/nodejs/nodejs12 -ARG BASE_TAG=12.19.0 +ARG BASE_TAG=12.20.0 -FROM lovasoa/wbo:1.6.5 as base +FROM lovasoa/wbo:1.7.0 as base FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} USER 0 - RUN rm -rf /opt/app && \ mkdir /opt/app @@ -24,11 +23,14 @@ RUN dnf upgrade -y && \ rm -rf /var/cache/dnf && \ chown -R $USER:$(id -gn $USER) /home/node/.config +ENV PORT 8080 EXPOSE 8080 + USER 1001 VOLUME /opt/app/server-data -HEALTHCHECK none +HEALTHCHECK --start-period=5s --timeout=5s \ + CMD curl -fs http://127.0.0.1:8080/ || exit 1 CMD ["npm", "start"] diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index 001f91a4356bb1f433b76e22c4f6ec00c996d864..2b2a1b5491a698b1a35b9a507363e0d4add44962 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -8,7 +8,7 @@ name: "opensource/lovasoa/wbo" # The most specific version should be the first tag and will be shown # on ironbank.dsop.io tags: -- "1.6.5" +- "v1.7.0" - "latest" # Build args passed to Dockerfile ARGs @@ -19,32 +19,32 @@ args: # Docker image labels labels: org.opencontainers.image.title: "wbo" - # Human-readable description of the software packaged in the image - org.opencontainers.image.description: "WBO is an online collaborative whiteboard that allows many users to draw simultaneously on a large virtual board." - # License(s) under which contained software is distributed - org.opencontainers.image.licenses: "GPL-3.0-or-later" - # URL to find more information on the image + ## Human-readable description of the software packaged in the image + org.opencontainers.image.description: "WBO is an online collaborative whiteboard." + ## License(s) under which contained software is distributed + org.opencontainers.image.licenses: "AGPL-3.19" + ## URL to find more information on the image org.opencontainers.image.url: "https://github.com/lovasoa/whitebophir" - # Name of the distributing entity, organization or individual + ## Name of the distributing entity, organization or individual org.opencontainers.image.vendor: "lovasoa" - org.opencontainers.image.version: "1.6.5" - # Keywords to help with search (ex. "cicd,gitops,golang") - mil.dso.ironbank.image.keywords: "white board,collaberation" - # This value can be "opensource" or "commercial" + org.opencontainers.image.version: "v1.7.0" + ## Keywords to help with search (ex. "cicd,gitops,golang") + mil.dso.ironbank.image.keywords: "opensource" + ## This value can be "opensource" or "commercial" mil.dso.ironbank.image.type: "opensource" - # Product the image belongs to for grouping multiple images - mil.dso.ironbank.product.name: "opensource" + ## Product the image belongs to for grouping multiple images + mil.dso.ironbank.product.name: "lovasoa/wbo" # List of resources to make available to the offline build context resources: -- tag: lovasoa/wbo:1.6.5 - url: docker://docker.io/lovasoa/wbo@sha256:3e213d476431fb1a238247afd7ab1ac61c6f9deeb9eae8d916eccd5d8e123ac2 +- tag: lovasoa/wbo:1.7.0 + url: docker://docker.io/lovasoa/wbo@sha256:0053a90f091cfc2e4040ff9cc361809d5078ddf678bea34ff1ebd6aba8a945d3 # List of project maintainers maintainers: - email: "shen_vickie@bah.com" - # The name of the current container owner - name: "shen_vickie" - # The gitlab username of the current container owner - username: "vickie.shen" +# # The name of the current container owner + name: "Vickie Shen" +# # The gitlab username of the current container owner + username: "shen_vickie" cht_member: true