From 9004969baade9d1480d0ec53309e5cee1273958c Mon Sep 17 00:00:00 2001 From: shen_vickie Date: Fri, 30 Apr 2021 12:26:36 -0400 Subject: [PATCH] fixed version tag --- Dockerfile | 7 +++++-- README.md | 2 +- hardening_manifest.yaml | 4 ++-- renovate.json | 16 +++------------- 4 files changed, 11 insertions(+), 18 deletions(-) diff --git a/Dockerfile b/Dockerfile index d547671..d5cf968 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_REGISTRY=registry1.dsop.io +ARG BASE_REGISTRY=registry1.dso.mil ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8 ARG BASE_TAG=8.3 @@ -6,7 +6,6 @@ FROM node:10.24 as base FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} - ENV HOME=/home/node \ USER=node @@ -28,7 +27,11 @@ COPY --from=base /opt /opt COPY scripts/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh WORKDIR ${HOME} + USER 1001 +HEALTHCHECK --start-period=3s --timeout=5s --interval=3s --retries=3 \ + CMD curl -fs http://localhost:3000 || exit 1 + ENTRYPOINT ["docker-entrypoint.sh"] CMD ["node"] diff --git a/README.md b/README.md index 21e8e6c..6ac5736 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Node.js 10.23 +# Node.js 10.24 ![logo](https://raw.githubusercontent.com/docker-library/docs/01c12653951b2fe592c1f93a13b4e289ada0e3a1/node/logo.png) diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index babba47..82cfcf3 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -8,7 +8,7 @@ name: "opensource/nodejs/nodejs10" # The most specific version should be the first tag and will be shown # on ironbank.dsop.io tags: -- "10.23" +- "10.24" - "latest" # Build args passed to Dockerfile ARGs @@ -27,7 +27,7 @@ labels: org.opencontainers.image.url: "docker.io/library/node@sha256:5f6fae164ed6e051b31cc81b6c5526114166ddacc6cd6ec3e1aa7e9396907f64" ## Name of the distributing entity, organization or individual org.opencontainers.image.vendor: "node" - org.opencontainers.image.version: "10.23" + org.opencontainers.image.version: "10.24" ## Keywords to help with search (ex. "cicd,gitops,golang") mil.dso.ironbank.image.keywords: "node,node10,nodejs,nodejs10" ## This value can be "opensource" or "commercial" diff --git a/renovate.json b/renovate.json index ecfba58..db2ec26 100644 --- a/renovate.json +++ b/renovate.json @@ -15,16 +15,6 @@ } ], "regexManagers": [ - { - "fileMatch": [ - "^Dockerfile$" - ], - "matchStrings": [ - "version=\"(?.*?)\"" - ], - "depNameTemplate": "node", - "datasourceTemplate": "docker" - }, { "fileMatch": [ "^hardening_manifest.yaml$" @@ -32,7 +22,7 @@ "matchStrings": [ "org\\.opencontainers\\.image\\.version:\\s+\"(?.+?)\"" ], - "depNameTemplate": "node", + "depNameTemplate": "nodejs/nodejs10", "datasourceTemplate": "docker" }, { @@ -42,8 +32,8 @@ "matchStrings": [ "tags:\\s+-\\s+\"(?.+?)\"" ], - "depNameTemplate": "node", + "depNameTemplate": "nodejs/nodejs10", "datasourceTemplate": "docker" } ] -} \ No newline at end of file +} -- GitLab