From cc43d353a1160375759c9485b52496a209786d45 Mon Sep 17 00:00:00 2001 From: "shen_vickie@bah.com" Date: Fri, 22 Jan 2021 12:31:06 -0500 Subject: [PATCH 1/4] added env port + renovate + hardening_manifest --- Dockerfile | 18 ++++++--------- Jenkinsfile | 2 -- download.yaml | 3 --- hardening_manifest.yaml | 50 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 57 insertions(+), 16 deletions(-) delete mode 100644 Jenkinsfile delete mode 100644 download.yaml create mode 100644 hardening_manifest.yaml diff --git a/Dockerfile b/Dockerfile index 1f9cfd1..5eaf917 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,20 +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.4 as base +FROM lovasoa/wbo:1.7.0 as base FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} USER 0 -LABEL org.opencontainers.image.title="lovasoa/wbo" \ - org.opencontainers.image.description="WBO is an online collaborative whiteboard." \ - org.opencontainers.image.licenses="AGPL-3.19" \ - org.opencontainers.image.url="https://github.com/lovasoa/whitebophir" \ - org.opencontainers.image.version="1.6.4" \ - maintainer="cht@dsop.io" - RUN rm -rf /opt/app && \ mkdir /opt/app @@ -30,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/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index 79d541a..0000000 --- a/Jenkinsfile +++ /dev/null @@ -1,2 +0,0 @@ -@Library('DCCSCR@timeouts-to-env') _ -dccscrPipeline(version: "1.6.4") diff --git a/download.yaml b/download.yaml deleted file mode 100644 index cc3960a..0000000 --- a/download.yaml +++ /dev/null @@ -1,3 +0,0 @@ -resources: - - url: "docker://docker.io/lovasoa/wbo@sha256:0c3308d0d508d4c91ab8aa2d5ab89340b06cf2761b793ee2417b8cf13867ae61" - tag: "lovasoa/wbo:1.6.4" diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml new file mode 100644 index 0000000..d490e4a --- /dev/null +++ b/hardening_manifest.yaml @@ -0,0 +1,50 @@ +--- +apiVersion: v1 + +# The repository name in registry1, excluding /ironbank/ +name: "opensource/lovasoa/wbo" + +# List of tags to push for the repository in registry1 +# The most specific version should be the first tag and will be shown +# on ironbank.dsop.io +tags: +- "v1.6.5" +- "latest" + +# Build args passed to Dockerfile ARGs +args: + BASE_IMAGE: "ironbank/opensource/nodejs/nodejs12" + BASE_TAG: "12.20.0" + +# 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." + ## 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 + org.opencontainers.image.vendor: "lovasoa" + 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: "lovasoa/wbo" + +# List of resources to make available to the offline build context +resources: +- 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: "Vickie Shen" +# # The gitlab username of the current container owner + username: "shen_vickie" + cht_member: true -- GitLab From 4b13240ccbe752bf8fc67b63764bff8cf987e560 Mon Sep 17 00:00:00 2001 From: "shen_vickie@bah.com" Date: Fri, 22 Jan 2021 12:37:11 -0500 Subject: [PATCH 2/4] updated tag --- hardening_manifest.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index d490e4a..7cd5d4e 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: -- "v1.6.5" +- "v1.7.0" - "latest" # Build args passed to Dockerfile ARGs -- GitLab From 4ef4de5db71908e3ab7efd06b4a128ee1cbb8be4 Mon Sep 17 00:00:00 2001 From: David Freeman Date: Fri, 22 Jan 2021 18:26:04 +0000 Subject: [PATCH 3/4] Update hardening_manifest.yaml --- hardening_manifest.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index 7cd5d4e..106d792 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -13,7 +13,7 @@ tags: # Build args passed to Dockerfile ARGs args: - BASE_IMAGE: "ironbank/opensource/nodejs/nodejs12" + BASE_IMAGE: "opensource/nodejs/nodejs12" BASE_TAG: "12.20.0" # Docker image labels -- GitLab From 2103f261efbf7f0c24eed0e8965a11e9131acdb2 Mon Sep 17 00:00:00 2001 From: David Freeman Date: Fri, 22 Jan 2021 18:31:55 +0000 Subject: [PATCH 4/4] Update hardening_manifest.yaml --- hardening_manifest.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index 106d792..2b2a1b5 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -14,7 +14,7 @@ tags: # Build args passed to Dockerfile ARGs args: BASE_IMAGE: "opensource/nodejs/nodejs12" - BASE_TAG: "12.20.0" + BASE_TAG: "12.20.1" # Docker image labels labels: -- GitLab